diff lisp/cus-edit.el @ 707:a307f9a2021d

[xemacs-hg @ 2001-12-20 05:49:28 by andyp] sync with 21-4-6-windows
author andyp
date Thu, 20 Dec 2001 05:49:48 +0000
parents 023b83f4e54b
children 79940b592197
line wrap: on
line diff
--- a/lisp/cus-edit.el	Wed Dec 19 00:40:26 2001 +0000
+++ b/lisp/cus-edit.el	Thu Dec 20 05:49:48 2001 +0000
@@ -3392,7 +3392,7 @@
  	(princ "\n"))
        (princ "(custom-set-variables")
        (mapatoms (lambda (symbol)
- 		  (let ((spec (car-safe (get symbol 'theme-value)))
+		   (let ((spec (car-safe (get symbol 'theme-value)))
  			(requests (get symbol 'custom-requests))
  			(now (not (or (get symbol 'standard-value)
  				      (and (not (boundp symbol))
@@ -3400,7 +3400,9 @@
 						    'rogue))))))
 			(comment (get symbol 'saved-variable-comment)))
  		    (when (or (and spec (eq (car spec) 'user)
- 			       (eq (second spec) 'set)) comment)
+ 			       (eq (second spec) 'set)) comment
+			       ;; support non-themed vars
+			       (and (null spec) (get symbol 'saved-value)))
  		      (princ "\n '(")
  		      (prin1 symbol)
  		      (princ " ")
@@ -3431,9 +3433,12 @@
 		   (not (eq (get symbol 'force-face) 'rogue)))))))
     (when (or (and (not (memq symbol custom-save-face-ignoring))
 	       ;; Don't print default face here.
-	       theme-spec
-	       (eq (car theme-spec) 'user)
-	       (eq (second theme-spec) 'set)) comment)
+		   (or (and theme-spec
+			    (eq (car theme-spec) 'user)
+			    (eq (second theme-spec) 'set))
+		       ;; cope with non-themed faces
+		       (and (null theme-spec)
+			    (get symbol 'saved-face)))) comment)
       (princ "\n '(")
       (prin1 symbol)
       (princ " ")