[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/custom.el
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/custom.el |
Date: |
Sat, 13 May 2006 16:16:44 +0000 |
Index: emacs/lisp/custom.el
diff -u emacs/lisp/custom.el:1.126 emacs/lisp/custom.el:1.127
--- emacs/lisp/custom.el:1.126 Fri Apr 14 00:46:39 2006
+++ emacs/lisp/custom.el Sat May 13 16:16:43 2006
@@ -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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/custom.el,
Chong Yidong <=