# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1135397113 0
# Node ID 32dce3f26e2154b405e9d7122226c774b3423fc6
# Parent  146a0850a22042ea2e784f21b67c1adc210128ec
	(custom-variable-reset-standard, custom-face-reset-standard):
	Recalculate new values.

diff -r 146a0850a220 -r 32dce3f26e21 lisp/ChangeLog
--- a/lisp/ChangeLog	Sat Dec 24 02:51:04 2005 +0000
+++ b/lisp/ChangeLog	Sat Dec 24 04:05:13 2005 +0000
@@ -11,7 +11,7 @@
 	(custom-variable-state-set, custom-face-state-set): Check
 	theme-value.
 	(custom-variable-reset-standard, custom-face-reset-standard):
-	Remove theme setting entirely.
+	Remove theme setting entirely.  Recalculate new values.
 
 2005-12-23  Juri Linkov  <juri@jurta.org>
 
diff -r 146a0850a220 -r 32dce3f26e21 lisp/cus-edit.el
--- a/lisp/cus-edit.el	Sat Dec 24 02:51:04 2005 +0000
+++ b/lisp/cus-edit.el	Sat Dec 24 04:05:13 2005 +0000
@@ -2769,6 +2769,7 @@
     (when (or (get symbol 'saved-value) (get symbol 'saved-variable-comment))
       (put symbol 'saved-value nil)
       (custom-push-theme 'theme-value symbol 'user 'reset nil)
+      (custom-theme-recalc-variable symbol)
       (put symbol 'saved-variable-comment nil)
       (custom-save-all))
     (widget-put widget :custom-state 'unknown)
@@ -3434,6 +3435,7 @@
     (when (or (get symbol 'saved-face) (get symbol 'saved-face-comment))
       (put symbol 'saved-face nil)
       (custom-push-theme 'theme-face symbol 'user 'reset nil)
+      (custom-theme-recalc-face symbol)
       ;; Do not explictly save resets to standards without themes.
       (if (null (cdr (get symbol 'theme-face)))
 	  (put symbol  'theme-face nil))