[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108394: * lisp/emacs-lisp/lisp-mode.el (eval-defun-2): Use `eval-sexp-add-defvars'

[Juri Linkov]

------------------------------------------------------------
revno: 108394
fixes bug: http://debbugs.gnu.org/10181
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Sun 2012-05-27 12:45:54 +0300
message:
  * 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'.
modified:
  lisp/ChangeLog
  lisp/emacs-lisp/edebug.el
  lisp/emacs-lisp/lisp-mode.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-05-27 01:06:44 +0000
+++ b/lisp/ChangeLog    2012-05-27 09:45:54 +0000
@@ -1,3 +1,12 @@
+2012-05-27  Juri Linkov  <address@hidden>
+
+       * emacs-lisp/lisp-mode.el (eval-defun-2): Use `eval-sexp-add-defvars'
+       after the `eval-defun-1' specialcaseing
+       like in `edebug-eval-defun' (bug#10181).
+
+       * emacs-lisp/edebug.el (edebug-eval-defun): Set `face-documentation'
+       like in `eval-defun-1'.
+
 2012-05-27  Eli Zaretskii  <address@hidden>
 
        * mail/sendmail.el (mail-yank-region): Recognize

=== modified file 'lisp/emacs-lisp/edebug.el'
--- a/lisp/emacs-lisp/edebug.el 2012-05-26 15:52:27 +0000
+++ b/lisp/emacs-lisp/edebug.el 2012-05-27 09:45:54 +0000
@@ -527,6 +527,7 @@
            (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

=== modified file 'lisp/emacs-lisp/lisp-mode.el'
--- a/lisp/emacs-lisp/lisp-mode.el      2012-05-26 15:52:27 +0000
+++ b/lisp/emacs-lisp/lisp-mode.el      2012-05-27 09:45:54 +0000
@@ -829,10 +829,10 @@
           (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