[Emacs-diffs] /srv/bzr/emacs/trunk r112833: * lisp/emacs-lisp/lisp-mode.el (eval-sexp-add-defvars): Expand macros

[Stefan Monnier]

------------------------------------------------------------
revno: 112833
fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=14422
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2013-06-03 11:28:10 -0400
message:
  * lisp/emacs-lisp/lisp-mode.el (eval-sexp-add-defvars): Expand macros
  eagerly.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/lisp-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-06-03 13:03:05 +0000
+++ b/lisp/ChangeLog    2013-06-03 15:28:10 +0000
@@ -1,3 +1,8 @@
+2013-06-03  Stefan Monnier  <address@hidden>
+
+       * emacs-lisp/lisp-mode.el (eval-sexp-add-defvars): Expand macros
+       eagerly (bug#14422).
+
 2013-06-03  Michael Albinus  <address@hidden>
 
        * autorevert.el (auto-revert-notify-enabled)

=== modified file 'lisp/emacs-lisp/lisp-mode.el'
--- a/lisp/emacs-lisp/lisp-mode.el      2013-05-29 14:14:16 +0000
+++ b/lisp/emacs-lisp/lisp-mode.el      2013-06-03 15:28:10 +0000
@@ -809,6 +809,7 @@
 (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