[Emacs-diffs] Changes to emacs/lisp/emacs-lisp/edebug.el

[Juri Linkov]

Index: emacs/lisp/emacs-lisp/edebug.el
diff -c emacs/lisp/emacs-lisp/edebug.el:3.75 
emacs/lisp/emacs-lisp/edebug.el:3.76
*** emacs/lisp/emacs-lisp/edebug.el:3.75        Fri Jun 17 14:32:46 2005
--- emacs/lisp/emacs-lisp/edebug.el     Tue Jun 21 15:59:51 2005
***************
*** 511,519 ****
           (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))))
      (setq edebug-result (eval form))
      (if (not edebugging)
        (princ edebug-result)
--- 511,526 ----
           (set-default (nth 1 form) (eval (nth 2 form))))
            ((eq (car form) 'defface)
             ;; Reset the face.
             (setq 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)