Mercurial > emacs
changeset 70646:af9f1a83e3cf
* custom.el (custom-push-theme): Load the variable before checking
its `standard-value'.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sat, 13 May 2006 16:16:43 +0000 |
| parents | b081f2f67743 |
| children | 1cadc44e0431 |
| files | lisp/ChangeLog lisp/custom.el |
| diffstat | 2 files changed, 15 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat May 13 13:32:10 2006 +0000 +++ b/lisp/ChangeLog Sat May 13 16:16:43 2006 +0000 @@ -1,4 +1,10 @@ +2006-05-13 Chong Yidong <cyd@stupidchicken.com> + + * custom.el (custom-push-theme): Load the variable before checking + its `standard-value'. + 2006-05-13 Lars Hansen <larsh@soem.dk> + * desktop.el (desktop-save): Use with-temp-buffer. 2006-05-12 Glenn Morris <rgm@gnu.org>
--- a/lisp/custom.el Sat May 13 13:32:10 2006 +0000 +++ b/lisp/custom.el Sat May 13 16:16:43 2006 +0000 @@ -825,11 +825,15 @@ ;; theme is later disabled. (if (null old) (if (and (eq prop 'theme-value) - (boundp symbol) - (or (null (get symbol 'standard-value)) - (not (equal (eval (car (get symbol 'standard-value))) - (symbol-value symbol))))) - (setq old (list (list 'changed (symbol-value symbol)))) + (boundp symbol)) + (let ((sv (get symbol 'standard-value))) + (when (and (null sv) (custom-variable-p symbol)) + (custom-load-symbol symbol) + (setq sv (get symbol 'standard-value))) + (if (or (null sv) + (not (equal (eval (car (get symbol 'standard-value))) + (symbol-value symbol)))) + (setq old (list (list 'changed (symbol-value symbol)))))) (if (and (facep symbol) (not (face-spec-match-p symbol (get symbol 'face-defface-spec)))) (setq old (list (list 'changed (list