* 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 7b525b72bdd8498e8f7bd6a950952dc962bb97b5..50a8bebf4c02860c0a32e2c471843373e8dee0aa 100644 (file)
--- 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)