From: Chong Yidong <cyd@stupidchicken.com>
Date: Sat, 24 Dec 2005 01:35:53 +0000 (+0000)
Subject: (custom-face-state-set): Check theme-value.
X-Git-Tag: emacs-pretest-22.0.90~5094
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=70128967dace2bdf6d9c4c713461ba7221942058;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dd952a3de2a..29437c27ce3 100644
--- 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 109c36e0b0d..948d8329d9d 100644
--- 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)