[Emacs-diffs] trunk r115018: * lisp/emacs-lisp/cl-macs.el (cl-symbol-macrolet): Use macroexp-progn.

[Stefan Monnier]

------------------------------------------------------------
revno: 115018
revision-id: address@hidden
parent: address@hidden
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Thu 2013-11-07 14:30:43 -0500
message:
  * lisp/emacs-lisp/cl-macs.el (cl-symbol-macrolet): Use macroexp-progn.
  (cl--block-wrapper): Fix last accidental change.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/cl-macs.el     clmacs.el-20091113204419-o5vbwnq5f7feedwu-612

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-11-07 11:13:41 +0000
+++ b/lisp/ChangeLog    2013-11-07 19:30:43 +0000
@@ -1,3 +1,8 @@
+2013-11-07  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/cl-macs.el (cl-symbol-macrolet): Use macroexp-progn.
+       (cl--block-wrapper): Fix last accidental change.
+
 2013-11-07  Michael Albinus  <address@hidden>
 
        * net/tramp-sh.el (tramp-set-remote-path, tramp-get-ls-command):

=== modified file 'lisp/emacs-lisp/cl-macs.el'
--- a/lisp/emacs-lisp/cl-macs.el        2013-11-07 04:38:00 +0000
+++ b/lisp/emacs-lisp/cl-macs.el        2013-11-07 19:30:43 +0000
@@ -1993,9 +1993,8 @@
           (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 @@
     ;; 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)