summaryrefslogtreecommitdiff
path: root/lisp/custom.el
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2006-03-21 16:44:10 +0000
committerChong Yidong <cyd@stupidchicken.com>2006-03-21 16:44:10 +0000
commit7ba46f114972735a3c05543cd4e7b7914d8f8f32 (patch)
tree1d7c1b61e92e999cb25c3c6a69a790b098714355 /lisp/custom.el
parentd668dd2d0a5147c99d6a0f5671c747080828b30c (diff)
downloademacs-7ba46f114972735a3c05543cd4e7b7914d8f8f32.tar.gz
* cus-edit.el (custom-face-set): Call custom-push-theme before
face-spec set so that `changed' theme is correctly saved. (custom-face-reset-standard): Reset to recalculated face rather than defface spec. * custom.el (custom-push-theme): Only save `changed' theme if the current face does not match the defface specs.
Diffstat (limited to 'lisp/custom.el')
-rw-r--r--lisp/custom.el3
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/custom.el b/lisp/custom.el
index 15b5b4a815c..c67f3b06272 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -819,7 +819,8 @@ See `custom-known-themes' for a list of known themes."
(not (equal (eval (car (get symbol 'standard-value)))
(symbol-value symbol)))))
(setq old (list (list 'changed (symbol-value symbol))))
- (if (facep symbol)
+ (if (and (facep symbol)
+ (not (face-spec-match-p symbol (get symbol 'face-defface-spec))))
(setq old (list (list 'changed (list
(append '(t) (custom-face-attributes-get symbol nil)))))))))
(put symbol prop (cons (list theme value) old))