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

* lisp/emacs-lisp/cl-macs.el (cl-symbol-macrolet): Use macroexp-progn.

Browse source 
(cl--block-wrapper): Fix last accidental change.
This commit is contained in:
Stefan Monnier 2013-11-07 14:30:43 -05:00
parent 1eb1f9e082
commit 3220d5279d
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lisp/emacs-lisp/cl-macs.el
View file

@ -1993,9 +1993,8 @@ by EXPANSION, and (setq NAME ...) will act like (setf EXPANSION ...).
(progn
(fset 'macroexpand #'cl--sm-macroexpand)
(let ((expansion
;; FIXME: For N bindings, this will traverse `body'
;; N times!
(macroexpand-all (cons 'progn body)
;; FIXME: For N bindings, this will traverse `body' N times!
(macroexpand-all (macroexp-progn body)
(cons (list (symbol-name (caar bindings))
(cl-cadar bindings))
macroexpand-all-environment))))
@ -2739,7 +2738,7 @@ macro that returns its `&whole' argument."
;; FIXME: To avoid re-applying macroexpand-all, we'd like to be able
;; to indicate that this return value is already fully expanded.
(if (cdr cl-entry)
`(catch ,(nth 1 cl-form) ,@(cdr cl-body))
`(catch ,(nth 1 cl-form) ,@(macroexp-unprogn cl-body))
cl-body)))
(cl-define-compiler-macro cl--block-throw (cl-tag cl-value)