* cus-edit.el (custom-save-variables): Allow unthemed values.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 180315ce9ea6f5493aaad537f5207c52c18725bd..aea866a4bf652b0cd8b931a3b9d3051b1166065d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-19  Chong Yidong  <cyd@stupidchicken.com>
+
+       * cus-edit.el (custom-save-variables): Allow unthemed values.
+
 2006-02-19  Nick Roberts  <nickrob@snap.net.nz>
 
        * progmodes/gud.el: Don't require font-lock as it's now

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 3d06bd0fcae88e8f82e3e27db094ccda621f0a0e..77335615bfe5f76211f9ce5a5e6faf219da5be5c 100644 (file)
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -4166,7 +4166,9 @@ This function does not save the buffer."
       (mapatoms
        (lambda (symbol)
         (if (and (get symbol 'saved-value)
-                 (eq 'user (car (car-safe (get symbol 'theme-value)))))
+                 ;; ignore theme values
+                 (or (null (get symbol 'theme-value))
+                     (eq 'user (caar (get symbol 'theme-value)))))
             (nconc saved-list (list symbol)))))
       (setq saved-list (sort (cdr saved-list) 'string<))
       (unless (bolp)