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

[Stefan Monnier]

branch: master
commit a5ad6747c9da238bd2bcd335b9744ce9f4972ff1
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>

    * lisp/emacs-lisp/cconv.el: Fix uncaught brain farts in last change
    
    (cconv--convert-funcbody, cconv-convert): Use `macroexp--warn-wrap` 
properly.
---
 lisp/emacs-lisp/cconv.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/emacs-lisp/cconv.el b/lisp/emacs-lisp/cconv.el
index 7b525b7..50a8beb 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)