Mercurial > emacs
changeset 109012:421f2b1cd824
* 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.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Wed, 16 Jun 2010 17:11:06 -0400 |
| parents | 6c39bda25895 |
| children | d94083f6e4e9 |
| files | lisp/ChangeLog lisp/emacs-lisp/cl-loaddefs.el lisp/emacs-lisp/macroexp.el |
| diffstat | 3 files changed, 5 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Jun 16 16:08:41 2010 -0400 +++ b/lisp/ChangeLog Wed Jun 16 17:11:06 2010 -0400 @@ -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).
--- a/lisp/emacs-lisp/cl-loaddefs.el Wed Jun 16 16:08:41 2010 -0400 +++ b/lisp/emacs-lisp/cl-loaddefs.el Wed Jun 16 17:11:06 2010 -0400 @@ -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" "\
--- a/lisp/emacs-lisp/macroexp.el Wed Jun 16 16:08:41 2010 -0400 +++ b/lisp/emacs-lisp/macroexp.el Wed Jun 16 17:11:06 2010 -0400 @@ -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