aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2012-09-19 23:29:41 -0400
committerStefan Monnier2012-09-19 23:29:41 -0400
commit7a04bee953b9b74c5ef24691e32c6b6d55ae1e4b (patch)
treeaa8bd67c29f33cc783d66564bae72bde56f9696c
parente99f70c8cd37778d63e2497ed59d64fda720f731 (diff)
downloademacs-7a04bee953b9b74c5ef24691e32c6b6d55ae1e4b.tar.gz
emacs-7a04bee953b9b74c5ef24691e32c6b6d55ae1e4b.zip
* lisp/emacs-lisp/macroexp.el (macroexp--expand-all): Fix last change.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/emacs-lisp/macroexp.el2
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d2266f9952f..9d9949c3999 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12012-09-20 Stefan Monnier <monnier@iro.umontreal.ca>
2
3 * emacs-lisp/macroexp.el (macroexp--expand-all): Fix last change.
4
12012-09-19 Juri Linkov <juri@jurta.org> 52012-09-19 Juri Linkov <juri@jurta.org>
2 6
3 * dired-aux.el (dired-diff): Add (require 'diff) because 7 * dired-aux.el (dired-diff): Add (require 'diff) because
diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el
index 6a84be06728..f9be3e4fcc4 100644
--- a/lisp/emacs-lisp/macroexp.el
+++ b/lisp/emacs-lisp/macroexp.el
@@ -149,7 +149,7 @@ Assumes the caller has bound `macroexpand-all-environment'."
149 (symbolp (car form)) 149 (symbolp (car form))
150 (get (car form) 'byte-obsolete-info)) 150 (get (car form) 'byte-obsolete-info))
151 (macroexp--funcall-and-return 151 (macroexp--funcall-and-return
152 (lambda () (byte-compile-warn-obsolete ',(car form))) 152 (lambda () (byte-compile-warn-obsolete (car form)))
153 #'ignore ;FIXME: We should `message' something. 153 #'ignore ;FIXME: We should `message' something.
154 new-form) 154 new-form)
155 new-form))) 155 new-form)))