X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fcus-edit.el;h=efe6ffb867958994c4ebebee4b1f969b018657ca;hb=63c876c50ae875aaf1b12a56a16b9456014135aa;hp=630c5dc5933df7ccaea734913acbfd1576d95e8d;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910;p=chise%2Fxemacs-chise.git

diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 630c5dc..efe6ffb 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -39,7 +39,7 @@
 ;; very slow in an average XEmacs because of the large number of
 ;; symbols requiring a large number of funcalls -- XEmacs with Gnus
 ;; can grow to some 17000 symbols without ever doing anything fancy.
-;; It would probably pay off to make a hashtable of symbols known to
+;; It would probably pay off to make a hash table of symbols known to
 ;; Custom, similar to custom-group-hash-table.
 
 ;; This is not top priority, because none of the functions that do
@@ -282,7 +282,7 @@
 (defun custom-split-regexp-maybe (regexp)
   "If REGEXP is a string, split it to a list at `\\|'.
 You can get the original back with from the result with:
-  (mapconcat 'identity result \"\\|\")
+  (mapconcat #'identity result \"\\|\")
 
 IF REGEXP is not a string, return it unchanged."
   (if (stringp regexp)
@@ -2288,11 +2288,7 @@ Match frames with dark backgrounds")
 	     (unless (widget-get widget :custom-form)
 		 (widget-put widget :custom-form custom-face-default-form))
 	     (let* ((symbol (widget-value widget))
-		    (spec (or (get symbol 'saved-face)
-			      (get symbol 'face-defface-spec)
-			      ;; Attempt to construct it.
-			      (list (list t (face-custom-attributes-get
-					     symbol (selected-frame))))))
+		    (spec (custom-face-get-spec symbol))
 		    (form (widget-get widget :custom-form))
 		    (indent (widget-get widget :indent))
 		    (edit (widget-create-child-and-convert
@@ -2391,7 +2387,7 @@ Optional EVENT is the location for the menu."
 	 (child (car (widget-get widget :children)))
 	 (value (widget-value child)))
     (put symbol 'customized-face value)
-    (face-spec-set symbol value)
+    (face-spec-set symbol value nil '(custom))
     (custom-face-state-set widget)
     (custom-redraw-magic widget)))
 
@@ -2400,7 +2396,7 @@ Optional EVENT is the location for the menu."
   (let* ((symbol (widget-value widget))
 	 (child (car (widget-get widget :children)))
 	 (value (widget-value child)))
-    (face-spec-set symbol value)
+    (face-spec-set symbol value nil '(custom))
     (put symbol 'saved-face value)
     (put symbol 'customized-face nil)
     (custom-save-all)
@@ -2415,7 +2411,7 @@ Optional EVENT is the location for the menu."
     (unless value
       (signal 'error (list "No saved value for this face" symbol)))
     (put symbol 'customized-face nil)
-    (face-spec-set symbol value)
+    (face-spec-set symbol value nil '(custom))
     (widget-value-set child value)
     (custom-face-state-set widget)
     (custom-redraw-magic widget)))
@@ -2431,7 +2427,7 @@ Optional EVENT is the location for the menu."
     (when (get symbol 'saved-face)
       (put symbol 'saved-face nil)
       (custom-save-all))
-    (face-spec-set symbol value)
+    (face-spec-set symbol value nil '(custom))
     (widget-value-set child value)
     (custom-face-state-set widget)
     (custom-redraw-magic widget)))
@@ -3016,7 +3012,7 @@ Leave point at the location of the call, or after the last expression."
 					   (not (get symbol 'force-value)))))))
 		    (when value
 		      (princ "\n '(")
-		      (princ symbol)
+		      (prin1 symbol)
 		      (princ " ")
 		      (prin1 (car value))
 		      (cond (requests
@@ -3057,7 +3053,7 @@ Leave point at the location of the call, or after the last expression."
 			       ;; Don't print default face here.
 			       value)
 		      (princ "\n '(")
-		      (princ symbol)
+		      (prin1 symbol)
 		      (princ " ")
 		      (prin1 value)
 		      (if (or (get symbol 'face-defface-spec)