procyberian/emacs
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
(cconv--convert-funcbody, cconv-convert): Use `macroexp--warn-wrap` properly.
This commit is contained in:
Stefan Monnier 2021-02-27 12:21:02 -05:00
parent de33de1a66
commit a5ad6747c9
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lisp/emacs-lisp/cconv.el
View file

@ -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)