Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-80

Merge from emacs--cvs-trunk--0

Patches applied:

 * emacs--cvs-trunk--0  (patch 531)

   - Update from CVS

2 files changed, 6 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c515f9accc7..a0256150af9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2005-09-05  Chong Yidong  <cyd@stupidchicken.com>
 
+        * custom.el (custom-push-theme): Fix last change.
+
+2005-09-05  Chong Yidong  <cyd@stupidchicken.com>
+
         * cus-theme.el (custom-theme-write-faces): Save the current face
         spec, not the defface spec.
 
diff --git a/lisp/custom.el b/lisp/custom.el
index 2b714a7b458..d634160e534 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -649,7 +649,8 @@ See `custom-known-themes' for a list of known themes."
         (progn
           (setcar (cdr setting) mode)
           (setcar (cddr setting) value))
-      (if (null old)
+      (if (and (null old)
+               (boundp symbol))
           (setq old
                 (list
                  (list 'standard 'set