From: Juri Linkov <juri@jurta.org>
Date: Tue, 21 Jun 2005 15:59:51 +0000 (+0000)
Subject: (edebug-eval-defun):
X-Git-Tag: emacs-pretest-22.0.90~8757
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7cbb6dad76b843f48f0f1edcc848bc9207ad8994;p=emacs.git

(edebug-eval-defun):
Set `saved-face' temporarily to nil before calling form.
Set `customized-face' to the new spec after that.
---

diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index e9c767961cd..ebe375088a3 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -511,9 +511,16 @@ the minibuffer."
 	   (set-default (nth 1 form) (eval (nth 2 form))))
           ((eq (car form) 'defface)
            ;; Reset the face.
-           (put (nth 1 form) 'face-defface-spec nil)
            (setq face-new-frame-defaults
-                 (assq-delete-all (nth 1 form) face-new-frame-defaults))))
+                 (assq-delete-all (nth 1 form) face-new-frame-defaults))
+           (put (nth 1 form) 'face-defface-spec nil)
+	   ;; See comments in `eval-defun-1' for purpose of code below
+	   (setq form (prog1 `(prog1 ,form
+				(put ',(nth 1 form) 'saved-face
+				     ',(get (nth 1 form) 'saved-face))
+				(put ',(nth 1 form) 'customized-face
+				     ',(nth 2 form)))
+			(put (nth 1 form) 'saved-face nil)))))
     (setq edebug-result (eval form))
     (if (not edebugging)
 	(princ edebug-result)