From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Sat, 27 Feb 2021 17:21:02 +0000 (-0500)
Subject: * lisp/emacs-lisp/cconv.el: Fix uncaught brain farts in last change
X-Git-Tag: emacs-28.0.90~3516
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=a5ad6747c9da238bd2bcd335b9744ce9f4972ff1;p=emacs.git

* lisp/emacs-lisp/cconv.el: Fix uncaught brain farts in last change

(cconv--convert-funcbody, cconv-convert): Use `macroexp--warn-wrap` properly.
---

diff --git a/lisp/emacs-lisp/cconv.el b/lisp/emacs-lisp/cconv.el
index 7b525b72bdd..50a8bebf4c0 100644
--- a/lisp/emacs-lisp/cconv.el
+++ b/lisp/emacs-lisp/cconv.el
@@ -286,7 +286,7 @@ of converted forms."
               (let (and (pred stringp) msg)
                 (cconv--warn-unused-msg arg "argument")))
          (if (assq arg env) (push `(,arg . nil) env)) ;FIXME: Is it needed?
-         (push (lambda (body) `(macroexp--warn-wrap ,msg ,body)) wrappers))
+         (push (lambda (body) (macroexp--warn-wrap msg body)) wrappers))
         (_
          (if (assq arg env) (push `(,arg . nil) env)))))
     (setq funcbody (mapcar (lambda (form)
@@ -505,7 +505,7 @@ places where they originally did not directly appear."
             (newprotform (cconv-convert protected-form env extend)))
        `(condition-case ,var
             ,(if msg
-                 `(macroexp--warn-wrap msg newprotform)
+                 (macroexp--warn-wrap msg newprotform)
                newprotform)
           ,@(mapcar
              (lambda (handler)