(edebug-eval-defun):

Set `saved-face' temporarily to nil before calling form.
Set `customized-face' to the new spec after that.
This commit is contained in:
Juri Linkov 2005-06-21 15:59:51 +00:00
parent a416b8923f
commit 7cbb6dad76

View file

@ -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)