(custom-face-state-set): Check theme-value.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dd952a3de2acb4f3f38b3f1cb51518e5b679ab5f..29437c27ce319f52433bb870964c5f6a65a11a07 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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.
 

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 109c36e0b0d9866a030bcca9203e22b57983cd72..948d8329d9d6695b0fcac77ffa281efd18c1995a 100644 (file)
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -3308,7 +3308,12 @@ widget.  If FILTER is nil, ACTION is always valid.")
                   (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)