aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2005-12-24 04:05:13 +0000
committerChong Yidong2005-12-24 04:05:13 +0000
commit9ff7a71aae8348973188d131c2166ceb94eb008c (patch)
treee05381630d3f531d972508e685fc7e0952babcde
parent14af1e44ad025c5028d74f9ac0910accd93189de (diff)
downloademacs-9ff7a71aae8348973188d131c2166ceb94eb008c.tar.gz
emacs-9ff7a71aae8348973188d131c2166ceb94eb008c.zip
(custom-variable-reset-standard, custom-face-reset-standard):
Recalculate new values.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/cus-edit.el2
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 29437c27ce3..7c5b5fd96c1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -11,7 +11,7 @@
11 (custom-variable-state-set, custom-face-state-set): Check 11 (custom-variable-state-set, custom-face-state-set): Check
12 theme-value. 12 theme-value.
13 (custom-variable-reset-standard, custom-face-reset-standard): 13 (custom-variable-reset-standard, custom-face-reset-standard):
14 Remove theme setting entirely. 14 Remove theme setting entirely. Recalculate new values.
15 15
162005-12-23 Juri Linkov <juri@jurta.org> 162005-12-23 Juri Linkov <juri@jurta.org>
17 17
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."
2769 (when (or (get symbol 'saved-value) (get symbol 'saved-variable-comment)) 2769 (when (or (get symbol 'saved-value) (get symbol 'saved-variable-comment))
2770 (put symbol 'saved-value nil) 2770 (put symbol 'saved-value nil)
2771 (custom-push-theme 'theme-value symbol 'user 'reset nil) 2771 (custom-push-theme 'theme-value symbol 'user 'reset nil)
2772 (custom-theme-recalc-variable symbol)
2772 (put symbol 'saved-variable-comment nil) 2773 (put symbol 'saved-variable-comment nil)
2773 (custom-save-all)) 2774 (custom-save-all))
2774 (widget-put widget :custom-state 'unknown) 2775 (widget-put widget :custom-state 'unknown)
@@ -3434,6 +3435,7 @@ restoring it to the state of a face that has never been customized."
3434 (when (or (get symbol 'saved-face) (get symbol 'saved-face-comment)) 3435 (when (or (get symbol 'saved-face) (get symbol 'saved-face-comment))
3435 (put symbol 'saved-face nil) 3436 (put symbol 'saved-face nil)
3436 (custom-push-theme 'theme-face symbol 'user 'reset nil) 3437 (custom-push-theme 'theme-face symbol 'user 'reset nil)
3438 (custom-theme-recalc-face symbol)
3437 ;; Do not explictly save resets to standards without themes. 3439 ;; Do not explictly save resets to standards without themes.
3438 (if (null (cdr (get symbol 'theme-face))) 3440 (if (null (cdr (get symbol 'theme-face)))
3439 (put symbol 'theme-face nil)) 3441 (put symbol 'theme-face nil))