aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2021-02-27 12:21:02 -0500
committerStefan Monnier2021-02-27 12:21:02 -0500
commita5ad6747c9da238bd2bcd335b9744ce9f4972ff1 (patch)
tree3411571e59cf8e8109541792247b21caea33d45d
parentde33de1a660283f45a10acfaedef20c460553dbd (diff)
downloademacs-a5ad6747c9da238bd2bcd335b9744ce9f4972ff1.tar.gz
emacs-a5ad6747c9da238bd2bcd335b9744ce9f4972ff1.zip
* lisp/emacs-lisp/cconv.el: Fix uncaught brain farts in last change
(cconv--convert-funcbody, cconv-convert): Use `macroexp--warn-wrap` properly.
-rw-r--r--lisp/emacs-lisp/cconv.el4
1 files changed, 2 insertions, 2 deletions
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."
286 (let (and (pred stringp) msg) 286 (let (and (pred stringp) msg)
287 (cconv--warn-unused-msg arg "argument"))) 287 (cconv--warn-unused-msg arg "argument")))
288 (if (assq arg env) (push `(,arg . nil) env)) ;FIXME: Is it needed? 288 (if (assq arg env) (push `(,arg . nil) env)) ;FIXME: Is it needed?
289 (push (lambda (body) `(macroexp--warn-wrap ,msg ,body)) wrappers)) 289 (push (lambda (body) (macroexp--warn-wrap msg body)) wrappers))
290 (_ 290 (_
291 (if (assq arg env) (push `(,arg . nil) env))))) 291 (if (assq arg env) (push `(,arg . nil) env)))))
292 (setq funcbody (mapcar (lambda (form) 292 (setq funcbody (mapcar (lambda (form)
@@ -505,7 +505,7 @@ places where they originally did not directly appear."
505 (newprotform (cconv-convert protected-form env extend))) 505 (newprotform (cconv-convert protected-form env extend)))
506 `(condition-case ,var 506 `(condition-case ,var
507 ,(if msg 507 ,(if msg
508 `(macroexp--warn-wrap msg newprotform) 508 (macroexp--warn-wrap msg newprotform)
509 newprotform) 509 newprotform)
510 ,@(mapcar 510 ,@(mapcar
511 (lambda (handler) 511 (lambda (handler)