Mercurial > emacs
changeset 67784:7c9d6a4a35c7
(custom-face-state-set): Check theme-value.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sat, 24 Dec 2005 01:35:53 +0000 |
| parents | 118df638c3ff |
| children | 9574f135f272 |
| files | lisp/ChangeLog lisp/cus-edit.el |
| diffstat | 2 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Dec 24 01:26:54 2005 +0000 +++ b/lisp/ChangeLog Sat Dec 24 01:35:53 2005 +0000 @@ -8,7 +8,8 @@ customization" button one line up. (custom-themed): New face. (custom-magic-alist): New value, THEMED, for theme settings. - (custom-variable-state-set): Check theme-value. + (custom-variable-state-set, custom-face-state-set): Check + theme-value. (custom-variable-reset-standard, custom-face-reset-standard): Remove theme setting entirely.
--- a/lisp/cus-edit.el Sat Dec 24 01:26:54 2005 +0000 +++ b/lisp/cus-edit.el Sat Dec 24 01:35:53 2005 +0000 @@ -3308,7 +3308,12 @@ (setq temp (get symbol 'saved-face-comment)) (or tmp temp)) (if (equal temp comment) - 'saved + (cond + ((eq 'user (caar (get symbol 'theme-face))) + 'saved) + ((eq 'standard (caar (get symbol 'theme-face))) + 'changed) + (t 'themed)) 'changed)) ((get symbol 'face-defface-spec) (if (equal comment nil)