summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2013-06-03 11:28:10 -0400
committerStefan Monnier <monnier@iro.umontreal.ca>2013-06-03 11:28:10 -0400
commit1f8fdd5391e2346e181ab7cb19144d072efdc7f7 (patch)
tree968f76be97ab130c32f4f450ff6271a89ef05f50
parenta8a7c5f651cd9c3d354a4cb4938e5289d4cbbe4b (diff)
downloademacs-1f8fdd5391e2346e181ab7cb19144d072efdc7f7.tar.gz
* lisp/emacs-lisp/lisp-mode.el (eval-sexp-add-defvars): Expand macros
eagerly. Fixes: debbugs:14422
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/lisp-mode.el1
2 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d33cec3ab05..ac3dbcf906b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-06-03 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * emacs-lisp/lisp-mode.el (eval-sexp-add-defvars): Expand macros
+ eagerly (bug#14422).
+
2013-06-03 Michael Albinus <michael.albinus@gmx.de>
* autorevert.el (auto-revert-notify-enabled)
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index ae855052524..02b020fa241 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -809,6 +809,7 @@ With argument, print output into current buffer."
(defun eval-sexp-add-defvars (exp &optional pos)
"Prepend EXP with all the `defvar's that precede it in the buffer.
POS specifies the starting position where EXP was found and defaults to point."
+ (setq exp (macroexpand-all exp)) ;Eager macro-expansion.
(if (not lexical-binding)
exp
(save-excursion