2 files changed, 15 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7fe0f61d723..d64f787931a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/custom.el b/lisp/custom.el
index 2ac1e23ac49..c0169812d36 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -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