From: Chong Yidong <cyd@stupidchicken.com>
Date: Sat, 24 Dec 2005 04:05:13 +0000 (+0000)
Subject: (custom-variable-reset-standard, custom-face-reset-standard):
X-Git-Tag: emacs-pretest-22.0.90~5088
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9ff7a71aae8348973188d131c2166ceb94eb008c;p=emacs.git

(custom-variable-reset-standard, custom-face-reset-standard):
	Recalculate new values.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 29437c27ce3..7c5b5fd96c1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 948d8329d9d..27be2a84980 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -2769,6 +2769,7 @@ becomes the backup value, so you can get it again."
     (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 @@ restoring it to the state of a face that has never been customized."
     (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))