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

[Richard M. Stallman]

Index: emacs/lisp/cus-edit.el
diff -c emacs/lisp/cus-edit.el:1.180 emacs/lisp/cus-edit.el:1.181
*** emacs/lisp/cus-edit.el:1.180        Sun Mar 23 20:45:08 2003
--- emacs/lisp/cus-edit.el      Wed May 28 07:12:24 2003
***************
*** 2982,3009 ****
    "Set the state of WIDGET."
    (let* ((symbol (widget-value widget))
         (comment (get symbol 'face-comment))
!        tmp temp)
!     (widget-put widget :custom-state
!               (cond ((progn
!                        (setq tmp (get symbol 'customized-face))
!                        (setq temp (get symbol 'customized-face-comment))
!                        (or tmp temp))
!                      (if (equal temp comment)
!                          'set
!                        'changed))
!                     ((progn
!                        (setq tmp (get symbol 'saved-face))
!                        (setq temp (get symbol 'saved-face-comment))
!                        (or tmp temp))
!                      (if (equal temp comment)
!                          'saved
!                        'changed))
!                     ((get symbol 'face-defface-spec)
!                      (if (equal comment nil)
!                          'standard
!                        'changed))
!                     (t
!                      'rogue)))))
  
  (defun custom-face-action (widget &optional event)
    "Show the menu for `custom-face' WIDGET.
--- 2982,3015 ----
    "Set the state of WIDGET."
    (let* ((symbol (widget-value widget))
         (comment (get symbol 'face-comment))
!        tmp temp
!        (state
!         (cond ((progn
!                  (setq tmp (get symbol 'customized-face))
!                  (setq temp (get symbol 'customized-face-comment))
!                  (or tmp temp))
!                (if (equal temp comment)
!                    'set
!                  'changed))
!               ((progn
!                  (setq tmp (get symbol 'saved-face))
!                  (setq temp (get symbol 'saved-face-comment))
!                  (or tmp temp))
!                (if (equal temp comment)
!                    'saved
!                  'changed))
!               ((get symbol 'face-defface-spec)
!                (if (equal comment nil)
!                    'standard
!                  'changed))
!               (t
!                'rogue))))
!     ;; If the user called set-face-attribute to change the default
!     ;; for new frames, this face is "set outside of Customize".
!     (if (and (not (eq state 'rogue))
!            (get symbol 'face-modified))
!       (setq state 'changed))
!     (widget-put widget :custom-state state)))
  
  (defun custom-face-action (widget &optional event)
    "Show the menu for `custom-face' WIDGET.