From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Wed, 16 Jun 2010 21:11:06 +0000 (-0400)
Subject: * lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Don't handle `lambda'
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~52^2~10
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=49b2e83db4e53168cfdef4caf0c9ea975397e044;p=emacs.git

* 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.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a70c564b1ef..18c99d4ebf0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-06-16  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+	* 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).
diff --git a/lisp/emacs-lisp/cl-loaddefs.el b/lisp/emacs-lisp/cl-loaddefs.el
index 325c7b1479f..b14c879fcf7 100644
--- a/lisp/emacs-lisp/cl-loaddefs.el
+++ b/lisp/emacs-lisp/cl-loaddefs.el
@@ -282,7 +282,7 @@ Not documented
 ;;;;;;  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" "\
diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el
index 364e3540703..aabf940964b 100644
--- a/lisp/emacs-lisp/macroexp.el
+++ b/lisp/emacs-lisp/macroexp.el
@@ -134,7 +134,7 @@ Assumes the caller has bound `macroexpand-all-environment'."
 		(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 @@ Assumes the caller has bound `macroexpand-all-environment'."
 			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