* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Put back special

handling for `lambda' (misunderstanding).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ce2560ffa8e0a4aec7e1ada2f5be37d859e8a941..479d8673bf1b6a680f8d00274e8f54c71350196f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/macroexp.el (macroexpand-all-1): Put back special
+       handling for `lambda' (misunderstanding).
+
 2010-06-16  Jay Belanger  <jay.p.belanger@gmail.com>
 
        * calc/calc-poly.el: (math-accum-factors):  Make sure that

diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el
index aabf940964b95820bd96899b36ba7dd72bf73e5d..876b9a468ac7291904e43f3cde554b93f7837433 100644 (file)
--- a/lisp/emacs-lisp/macroexp.el
+++ b/lisp/emacs-lisp/macroexp.el
@@ -145,6 +145,11 @@ Assumes the caller has bound `macroexpand-all-environment'."
                        form))
           ((eq fun 'quote)
            form)
+          ((and (consp fun) (eq (car fun) 'lambda))
+           ;; Embedded lambda in function position.
+           (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