[Emacs-diffs] /srv/bzr/emacs/trunk r100607: * lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Don't handle `lambda'

[Stefan Monnier]

------------------------------------------------------------
revno: 100607
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2010-06-16 17:11:06 -0400
message:
  * lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Don't handle `lambda'
  specially, since it's a macro.  Fix up wrong hint passed to maybe-cons.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/cl-loaddefs.el
  lisp/emacs-lisp/macroexp.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-06-16 20:08:41 +0000
+++ b/lisp/ChangeLog    2010-06-16 21:11:06 +0000
@@ -1,5 +1,8 @@
 2010-06-16  Stefan Monnier  <address@hidden>
 
+       * emacs-lisp/macroexp.el (macroexpand-all-1): Don't handle `lambda'
+       specially, since it's a macro.  Fix up wrong hint passed to maybe-cons.
+
        * font-lock.el (font-lock-major-mode): Rename from
        font-lock-mode-major-mode to distinguish it from
        global-font-lock-mode's own font-lock-mode-major-mode (bug#6135).

=== modified file 'lisp/emacs-lisp/cl-loaddefs.el'
--- a/lisp/emacs-lisp/cl-loaddefs.el    2010-05-25 02:11:08 +0000
+++ b/lisp/emacs-lisp/cl-loaddefs.el    2010-06-16 21:11:06 +0000
@@ -282,7 +282,7 @@
 ;;;;;;  flet progv psetq do-all-symbols do-symbols dotimes dolist
 ;;;;;;  do* do loop return-from return block etypecase typecase ecase
 ;;;;;;  case load-time-value eval-when destructuring-bind function*
-;;;;;;  defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" 
"fbeedbf769c72fee9b4e0671957c1077")
+;;;;;;  defmacro* defun* gentemp gensym) "cl-macs" "cl-macs.el" 
"36cafd5054969b5bb0b1ce6a21605fed")
 ;;; Generated autoloads from cl-macs.el
 
 (autoload 'gensym "cl-macs" "\

=== modified file 'lisp/emacs-lisp/macroexp.el'
--- a/lisp/emacs-lisp/macroexp.el       2010-01-13 08:35:10 +0000
+++ b/lisp/emacs-lisp/macroexp.el       2010-06-16 21:11:06 +0000
@@ -134,7 +134,7 @@
                (maybe-cons fun
                            (maybe-cons (macroexpand-all-forms (cadr form) 2)
                                        nil
-                                       (cadr form))
+                                       (cdr form))
                            form)
              form))
           ((memq fun '(let let*))
@@ -145,11 +145,6 @@
                        form))
           ((eq fun 'quote)
            form)
-          ((and (consp fun) (eq (car fun) 'lambda))
-           ;; embedded lambda
-           (maybe-cons (macroexpand-all-forms fun 2)
-                       (macroexpand-all-forms (cdr form))
-                       form))
           ;; The following few cases are for normal function calls that
           ;; are known to funcall one of their arguments.  The byte
           ;; compiler has traditionally handled these functions specially