diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-06-18 10:13:59 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2010-06-18 10:13:59 -0400 |
| commit | 894e369ddf48e191638b8e66ce732f24ff9abe2a (patch) | |
| tree | 0d14b38c2946f0067c856911bf4949b7e8091a88 /lisp/emacs-lisp/macroexp.el | |
| parent | 4a330052b4815cf833071aae5cb312f6f0f63613 (diff) | |
| parent | b1a03ef6bfba4296dddc3df1e8f9d54aba3e45e3 (diff) | |
| download | emacs-894e369ddf48e191638b8e66ce732f24ff9abe2a.tar.gz emacs-894e369ddf48e191638b8e66ce732f24ff9abe2a.tar.bz2 emacs-894e369ddf48e191638b8e66ce732f24ff9abe2a.zip | |
Merge from trunk
Diffstat (limited to 'lisp/emacs-lisp/macroexp.el')
| -rw-r--r-- | lisp/emacs-lisp/macroexp.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el index 364e3540703..876b9a468ac 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*)) @@ -146,7 +146,7 @@ Assumes the caller has bound `macroexpand-all-environment'." ((eq fun 'quote) form) ((and (consp fun) (eq (car fun) 'lambda)) - ;; embedded lambda + ;; Embedded lambda in function position. (maybe-cons (macroexpand-all-forms fun 2) (macroexpand-all-forms (cdr form)) form)) |