* lisp/custom.el (custom-push-theme): Quote "changed" custom var entry.

2 files changed, 8 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a52abe07b1f..3a4b3feeec6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-21  Chong Yidong  <cyd@stupidchicken.com>
+
+        * custom.el (custom-push-theme): Quote "changed" custom var entry.
+
 2011-03-21  Leo Liu  <sdl.web@gmail.com>
 
         * ido.el (ido-read-internal): Add ido-selected to history instead
diff --git a/lisp/custom.el b/lisp/custom.el
index cf06fe27f4d..4f7826093e8 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -849,10 +849,10 @@ See `custom-known-themes' for a list of known themes."
         ;; theme is later disabled.
         (cond ((and (eq prop 'theme-value)
                     (boundp symbol))
-               (let ((sv (get symbol 'standard-value)))
-                 (unless (and sv
-                              (equal (eval (car sv)) (symbol-value symbol)))
-                   (setq old (list (list 'changed (symbol-value symbol)))))))
+               (let ((sv  (get symbol 'standard-value))
+                     (val (symbol-value symbol)))
+                 (unless (and sv (equal (eval (car sv)) val))
+                   (setq old `((changed ,(custom-quote val)))))))
               ((and (facep symbol)
                     (not (face-attr-match-p
                           symbol