* lisp/emacs-lisp/lisp-mode.el (eval-defun-2): Use eval-sexp-add-defvars.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5cd9c2260886946af3d2bd983c13877dd845fccb..e9f6e5995e63d8d3199bf389fe8e576db25d18b1 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2011-04-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * emacs-lisp/lisp-mode.el (eval-defun-2): Use eval-sexp-add-defvars.
+
        * htmlfontify.el (hfy-etags-cmd): Remove inoperant eval-and-compile.
        (hfy-e2x-etags-cmd, hfy-etags-cmd-alist-default)
        (hfy-etags-cmd-alist): Don't eval-and-compile any more.

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 39bdb5050393f0e132b9b8778960ee59797f5f13..04299aec0991fd89d1a35f56a2f02c67543c535c 100644 (file)
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -844,7 +844,7 @@ Return the result of evaluation."
           (end-of-defun)
           (beginning-of-defun)
           (setq beg (point))
-          (setq form (read (current-buffer)))
+          (setq form (eval-sexp-add-defvars (read (current-buffer))))
           (setq end (point)))
         ;; Alter the form if necessary.
         (setq form (eval-defun-1 (macroexpand form)))