projects
/
chise
/
xemacs-chise.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update.
[chise/xemacs-chise.git]
/
lisp
/
cus-edit.el
diff --git
a/lisp/cus-edit.el
b/lisp/cus-edit.el
index
7a573fe
..
efe6ffb
100644
(file)
--- 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.
;; 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
;; 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:
(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)
IF REGEXP is not a string, return it unchanged."
(if (stringp regexp)
@@
-2288,12
+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))
(unless (widget-get widget :custom-form)
(widget-put widget :custom-form custom-face-default-form))
(let* ((symbol (widget-value widget))
- (spec (or (get symbol 'customized-face)
- (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
(form (widget-get widget :custom-form))
(indent (widget-get widget :indent))
(edit (widget-create-child-and-convert
@@
-2392,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)
(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)))
(custom-face-state-set widget)
(custom-redraw-magic widget)))
@@
-2401,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)))
(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)
(put symbol 'saved-face value)
(put symbol 'customized-face nil)
(custom-save-all)
@@
-2416,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)
(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)))
(widget-value-set child value)
(custom-face-state-set widget)
(custom-redraw-magic widget)))
@@
-2432,7
+2427,7
@@
Optional EVENT is the location for the menu."
(when (get symbol 'saved-face)
(put symbol 'saved-face nil)
(custom-save-all))
(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)))
(widget-value-set child value)
(custom-face-state-set widget)
(custom-redraw-magic widget)))
@@
-3017,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 '(")
(not (get symbol 'force-value)))))))
(when value
(princ "\n '(")
- (princ symbol)
+ (prin1 symbol)
(princ " ")
(prin1 (car value))
(cond (requests
(princ " ")
(prin1 (car value))
(cond (requests
@@
-3058,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 '(")
;; Don't print default face here.
value)
(princ "\n '(")
- (princ symbol)
+ (prin1 symbol)
(princ " ")
(prin1 value)
(if (or (get symbol 'face-defface-spec)
(princ " ")
(prin1 value)
(if (or (get symbol 'face-defface-spec)