Subject: bug#31792: 27.0.50; Regression in #'labels, recent versions

From: Stefan Monnier <[email-masked]>
Date: Wed, 13 Jun 2018 09:16:01 -0400

> diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el
> index d53c8e0bbc..85deb8cb4f 100644
> --- a/lisp/emacs-lisp/cl.el
> +++ b/lisp/emacs-lisp/cl.el
> @@ -466,8 +466,9 @@ labels
>  	(push var sets)
>  	(push (cons (car binding)
>                      `(lambda (&rest cl-labels-args)
> -                       (cl-list* 'funcall ',var
> -                                 cl-labels-args)))
> +                       (if (eq (car cl-labels-args) cl--labels-magic)
> +                           (list cl--labels-magic ',var)
> +                         (cl-list* 'funcall ',var cl-labels-args))))
>                newenv)))
>      (macroexpand-all `(lexical-let ,vars (setq ,@sets) ,@body) newenv)))

Looks good, but please add a comment before the call to macroexpand-all
reminding that lexical-let installs a macroexpander for `function` that
ends up calling cl--labels-convert.

        Stefan