diff options
| author | Juri Linkov <juri@jurta.org> | 2012-05-27 12:45:54 +0300 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2012-05-27 12:45:54 +0300 |
| commit | e4d4f53985fc9ab929f063f63a173a9114d3beb6 (patch) | |
| tree | e0fe315a768d99c9c47de59a24acf6798784dec1 /lisp/emacs-lisp | |
| parent | 50c4645e2cc7857c84abeaa3f4787fc7ea34f5a6 (diff) | |
| download | emacs-e4d4f53985fc9ab929f063f63a173a9114d3beb6.tar.gz emacs-e4d4f53985fc9ab929f063f63a173a9114d3beb6.tar.bz2 emacs-e4d4f53985fc9ab929f063f63a173a9114d3beb6.zip | |
* lisp/emacs-lisp/lisp-mode.el (eval-defun-2): Use `eval-sexp-add-defvars'
after the `eval-defun-1' specialcaseing
like in `edebug-eval-defun'.
* lisp/emacs-lisp/edebug.el (edebug-eval-defun): Set `face-documentation'
like in `eval-defun-1'.
Fixes: debbugs:10181
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/edebug.el | 1 | ||||
| -rw-r--r-- | lisp/emacs-lisp/lisp-mode.el | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el index 9d3ee307083..ee5e5d0ff89 100644 --- a/lisp/emacs-lisp/edebug.el +++ b/lisp/emacs-lisp/edebug.el @@ -527,6 +527,7 @@ the minibuffer." (setq face-new-frame-defaults (assq-delete-all (nth 1 form) face-new-frame-defaults)) (put (nth 1 form) 'face-defface-spec nil) + (put (nth 1 form) 'face-documentation (nth 3 form)) ;; See comments in `eval-defun-1' for purpose of code below (setq form (prog1 `(prog1 ,form (put ',(nth 1 form) 'saved-face diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index d76c1ad3e72..973d57d4210 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -829,10 +829,10 @@ Return the result of evaluation." (end-of-defun) (beginning-of-defun) (setq beg (point)) - (setq form (eval-sexp-add-defvars (read (current-buffer)))) + (setq form (read (current-buffer))) (setq end (point))) ;; Alter the form if necessary. - (setq form (eval-defun-1 (macroexpand form))) + (setq form (eval-sexp-add-defvars (eval-defun-1 (macroexpand form)))) (list beg end standard-output `(lambda (ignore) ;; Skipping to the end of the specified region |