diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-06-16 17:11:06 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-06-16 17:11:06 -0400 |
| commit | 49b2e83db4e53168cfdef4caf0c9ea975397e044 (patch) | |
| tree | 3a4a007e156fd42f4d466d1c10bd374687d3fb2c /lisp/emacs-lisp | |
| parent | 2a64315a111fb4da67e9c40c9b69045c4f63d619 (diff) | |
| download | emacs-49b2e83db4e53168cfdef4caf0c9ea975397e044.tar.gz emacs-49b2e83db4e53168cfdef4caf0c9ea975397e044.tar.bz2 emacs-49b2e83db4e53168cfdef4caf0c9ea975397e044.zip | |
* 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.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/cl-loaddefs.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/macroexp.el | 7 |
2 files changed, 2 insertions, 7 deletions
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 |