* custom.el (customize-mark-as-set): Push to `user' theme.

2 files changed, 5 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ce799882a1a..2f23a9cb1db 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,9 +1,9 @@
 2006-02-19  Chong Yidong  <cyd@stupidchicken.com>
 
-        * custom.el (customize-mark-to-save): Load the symbol's
-        dependencies, so that `standard-value' will be present.
+        * custom.el (customize-mark-as-set): Push to `user' theme.
 
         * cus-edit.el (custom-save-variables): Allow unthemed values.
+        (customize-set-variable): Push setting to `user' theme.
 
 2006-02-19  Nick Roberts  <nickrob@snap.net.nz>
 
diff --git a/lisp/custom.el b/lisp/custom.el
index fe2829e644a..bdac459daee 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -653,7 +653,6 @@ default value.  Otherwise, set it to nil.
 To actually save the value, call `custom-save-all'.
 
 Return non-nil iff the `saved-value' property actually changed."
-  (custom-load-symbol symbol)
   (let* ((get (or (get symbol 'custom-get) 'default-value))
          (value (funcall get symbol))
          (saved (get symbol 'saved-value))
@@ -691,7 +690,9 @@ Return non-nil iff the `customized-value' property actually changed."
             (not (equal value (condition-case nil
                                   (eval (car old))
                                 (error nil)))))
-        (put symbol 'customized-value (list (custom-quote value)))
+        (progn (put symbol 'customized-value (list (custom-quote value)))
+               (custom-push-theme 'theme-value symbol 'user 'set
+                                  (custom-quote value)))
       (put symbol 'customized-value nil))
     ;; Changed?
     (not (equal customized (get symbol 'customized-value)))))