# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1147537003 0
# Node ID af9f1a83e3cf514b751b183f49422c2cc2d7b072
# Parent  b081f2f677437b0dc88c6b6c95d893e596f4f475
	* custom.el (custom-push-theme): Load the variable before checking
	its `standard-value'.

diff -r b081f2f67743 -r af9f1a83e3cf lisp/ChangeLog
--- 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>
diff -r b081f2f67743 -r af9f1a83e3cf lisp/custom.el
--- 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