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

[Chong Yidong]

Index: emacs/lisp/cus-face.el
diff -c emacs/lisp/cus-face.el:1.42 emacs/lisp/cus-face.el:1.43
*** emacs/lisp/cus-face.el:1.42 Fri Oct 21 08:26:37 2005
--- emacs/lisp/cus-face.el      Fri Nov 25 18:00:10 2005
***************
*** 320,332 ****
            (let ((face (nth 0 entry))
                  (spec (nth 1 entry))
                  (now (nth 2 entry))
!                 (comment (nth 3 entry)))
              ;; If FACE is actually an alias, customize the face it
              ;; is aliased to.
              (if (get face 'face-alias)
                  (setq face (get face 'face-alias)))
!             (put face 'saved-face spec)
!             (put face 'saved-face-comment comment)
              (custom-push-theme 'theme-face face theme 'set spec)
              (when (or now immediate)
                (put face 'force-face (if now 'rogue 'immediate)))
--- 320,337 ----
            (let ((face (nth 0 entry))
                  (spec (nth 1 entry))
                  (now (nth 2 entry))
!                 (comment (nth 3 entry))
!                 oldspec)
              ;; If FACE is actually an alias, customize the face it
              ;; is aliased to.
              (if (get face 'face-alias)
                  (setq face (get face 'face-alias)))
! 
!             (setq oldspec (get face 'theme-face))
!             (when (not (and oldspec (eq 'user (caar oldspec))))
!               (put face 'saved-face spec)
!               (put face 'saved-face-comment comment))
! 
              (custom-push-theme 'theme-face face theme 'set spec)
              (when (or now immediate)
                (put face 'force-face (if now 'rogue 'immediate)))