Mercurial > emacs
comparison lisp/custom.el @ 69624:efd1add5bedf
* 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.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Tue, 21 Mar 2006 16:44:10 +0000 |
| parents | 2e60323be52d |
| children | dc1f0ab7e276 e6bf73e43cf4 |
comparison
equal
deleted
inserted
replaced
| 69623:a80a437040ab | 69624:efd1add5bedf |
|---|---|
| 817 (boundp symbol) | 817 (boundp symbol) |
| 818 (or (null (get symbol 'standard-value)) | 818 (or (null (get symbol 'standard-value)) |
| 819 (not (equal (eval (car (get symbol 'standard-value))) | 819 (not (equal (eval (car (get symbol 'standard-value))) |
| 820 (symbol-value symbol))))) | 820 (symbol-value symbol))))) |
| 821 (setq old (list (list 'changed (symbol-value symbol)))) | 821 (setq old (list (list 'changed (symbol-value symbol)))) |
| 822 (if (facep symbol) | 822 (if (and (facep symbol) |
| 823 (not (face-spec-match-p symbol (get symbol 'face-defface-spec)))) | |
| 823 (setq old (list (list 'changed (list | 824 (setq old (list (list 'changed (list |
| 824 (append '(t) (custom-face-attributes-get symbol nil))))))))) | 825 (append '(t) (custom-face-attributes-get symbol nil))))))))) |
| 825 (put symbol prop (cons (list theme value) old)) | 826 (put symbol prop (cons (list theme value) old)) |
| 826 (put theme 'theme-settings | 827 (put theme 'theme-settings |
| 827 (cons (list prop symbol theme value) | 828 (cons (list prop symbol theme value) |