From 1f8fdd5391e2346e181ab7cb19144d072efdc7f7 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 3 Jun 2013 11:28:10 -0400 Subject: [PATCH] * lisp/emacs-lisp/lisp-mode.el (eval-sexp-add-defvars): Expand macros eagerly. Fixes: debbugs:14422 --- lisp/ChangeLog | 5 +++++ lisp/emacs-lisp/lisp-mode.el | 1 + 2 files changed, 6 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d33cec3ab0..ac3dbcf906 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-06-03 Stefan Monnier + + * emacs-lisp/lisp-mode.el (eval-sexp-add-defvars): Expand macros + eagerly (bug#14422). + 2013-06-03 Michael Albinus * autorevert.el (auto-revert-notify-enabled) diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index ae85505252..02b020fa24 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 -- 2.20.1