From 6f5424852f2892364f69fbd47b197fc94010f79c Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 15 Apr 2011 09:57:53 -0300 Subject: [PATCH] * lisp/emacs-lisp/lisp-mode.el (eval-defun-2): Use eval-sexp-add-defvars. --- lisp/ChangeLog | 2 ++ lisp/emacs-lisp/lisp-mode.el | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5cd9c226088..e9f6e5995e6 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,7 @@ 2011-04-15 Stefan Monnier + * 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 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." (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))) -- 2.39.2