From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 19 Feb 2006 15:50:09 +0000 (+0000)
Subject: * cus-edit.el (custom-save-variables): Allow unthemed values.
X-Git-Tag: emacs-pretest-22.0.90~4033
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2d656942f6430b5135c5c01814d4ee73ad3bece6;p=emacs.git

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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 180315ce9ea..aea866a4bf6 100644
--- 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 3d06bd0fcae..77335615bfe 100644
--- 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)