Mercurial > emacs

diff lisp/custom.el @ 90399:a5812696f7bf unicode-pre-font-backend

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 274-284) - Update from CVS - Update etc/MORE.STUFF. - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 101) - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-62
author Miles Bader <miles@gnu.org>
date Wed, 17 May 2006 07:46:49 +0000
parents c156f6a9e7b5 af9f1a83e3cf
children 8a8e69664178
line wrap: on
line diff
--- a/lisp/custom.el	Mon May 15 03:48:50 2006 +0000
+++ b/lisp/custom.el	Wed May 17 07:46:49 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