Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-17 10:27:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

* custom.el (custom-push-theme): Load the variable before checking

Browse source 
its `standard-value'.
This commit is contained in:
Chong Yidong 2006-05-13 16:16:43 +00:00
parent 9fbcde29a5
commit e58d8ef513
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/ChangeLog
View file

@ -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>

14
lisp/custom.el
View file

@ -825,11 +825,15 @@ See `custom-known-themes' for a list of known themes."
;; 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