# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1135388153 0
# Node ID 7c9d6a4a35c7ab62b5a62fb609363a346eb60a6e
# Parent  118df638c3ffd701400c047c150be62c09af4ec0
	(custom-face-state-set): Check theme-value.

diff -r 118df638c3ff -r 7c9d6a4a35c7 lisp/ChangeLog
--- 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.
 
diff -r 118df638c3ff -r 7c9d6a4a35c7 lisp/cus-edit.el
--- 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)