aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefan Monnier2011-04-15 09:57:53 -0300
committerStefan Monnier2011-04-15 09:57:53 -0300
commit6f5424852f2892364f69fbd47b197fc94010f79c (patch)
tree0802e72529a1363b6183e44d53ee8dce7e786ae1
parent70f6144dbd8ab3f9f1d57f65cc795a6e78c4c4d9 (diff)
downloademacs-6f5424852f2892364f69fbd47b197fc94010f79c.tar.gz
emacs-6f5424852f2892364f69fbd47b197fc94010f79c.zip
* lisp/emacs-lisp/lisp-mode.el (eval-defun-2): Use eval-sexp-add-defvars.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/emacs-lisp/lisp-mode.el2
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5cd9c226088..e9f6e5995e6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12011-04-15 Stefan Monnier <monnier@iro.umontreal.ca> 12011-04-15 Stefan Monnier <monnier@iro.umontreal.ca>
2 2
3 * emacs-lisp/lisp-mode.el (eval-defun-2): Use eval-sexp-add-defvars.
4
3 * htmlfontify.el (hfy-etags-cmd): Remove inoperant eval-and-compile. 5 * htmlfontify.el (hfy-etags-cmd): Remove inoperant eval-and-compile.
4 (hfy-e2x-etags-cmd, hfy-etags-cmd-alist-default) 6 (hfy-e2x-etags-cmd, hfy-etags-cmd-alist-default)
5 (hfy-etags-cmd-alist): Don't eval-and-compile any more. 7 (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 39bdb505039..04299aec099 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -844,7 +844,7 @@ Return the result of evaluation."
844 (end-of-defun) 844 (end-of-defun)
845 (beginning-of-defun) 845 (beginning-of-defun)
846 (setq beg (point)) 846 (setq beg (point))
847 (setq form (read (current-buffer))) 847 (setq form (eval-sexp-add-defvars (read (current-buffer))))
848 (setq end (point))) 848 (setq end (point)))
849 ;; Alter the form if necessary. 849 ;; Alter the form if necessary.
850 (setq form (eval-defun-1 (macroexpand form))) 850 (setq form (eval-defun-1 (macroexpand form)))