Mercurial > hg > xemacs-beta
diff lisp/cus-edit.el @ 4744:17f7e9191c0b
Rationalise duplicated functionality, #'custom-quote, #'quote-maybe.
src/ChangeLog addition:
2009-11-15 Aidan Kehoe <kehoea@parhasard.net>
* eval.c (Fquote_maybe):
Move this function here from callint.c; make it more comprehensive
about which types are self-quoting.
* lisp.h: Declare Fquote_maybe here, since it's now used in
callint.c and defined in eval.c
* callint.c (Fquote_maybe): Remove this function from this file.
lisp/ChangeLog addition:
2009-11-15 Aidan Kehoe <kehoea@parhasard.net>
* custom.el (custom-quote):
Define this as an alias for `quote-maybe', which is in C and more
comprehensive; packages still use this name in places.
(customize-mark-to-save, customize-mark-as-set): Use
`quote-maybe', not `custom-quote'.
* cus-edit.el (customize-set-variable, customize-save-variable)
(custom-variable-value-create, custom-variable-set)
(custom-variable-pre-save):
Remove a version of `custom-quote' specific to this file; use
`quote-maybe' universally instead.
| author | Aidan Kehoe <kehoea@parhasard.net> |
|---|---|
| date | Sun, 15 Nov 2009 14:59:53 +0000 |
| parents | 684f0ed6cd4f |
| children | fd36a980d701 |
line wrap: on
line diff
--- a/lisp/cus-edit.el Sat Nov 14 13:33:52 2009 +0000 +++ b/lisp/cus-edit.el Sun Nov 15 14:59:53 2009 +0000 @@ -269,19 +269,6 @@ ;;; Utilities. -(defun custom-quote (sexp) - "Quote SEXP iff it is not self quoting." - (if (or (memq sexp '(t nil)) - (keywordp sexp) - (eq (car-safe sexp) 'lambda) - (stringp sexp) - (numberp sexp) - (characterp sexp) - (vectorp sexp) - (bit-vector-p sexp)) - sexp - (list 'quote sexp))) - (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: @@ -732,7 +719,7 @@ "Set customized value of %s" current-prefix-arg)) (funcall (or (get variable 'custom-set) 'set-default) variable value) - (put variable 'customized-value (list (custom-quote value))) + (put variable 'customized-value (list (quote-maybe value))) (cond ((string= comment "") (put variable 'variable-comment nil) (put variable 'customized-variable-comment nil)) @@ -761,8 +748,8 @@ "Set and save value of %s" current-prefix-arg)) (funcall (or (get variable 'custom-set) 'set-default) variable value) - (put variable 'saved-value (list (custom-quote value))) - (custom-push-theme 'theme-value variable 'user 'set (list (custom-quote value))) + (put variable 'saved-value (list (quote-maybe value))) + (custom-push-theme 'theme-value variable 'user 'set (list (quote-maybe value))) (cond ((string= comment "") (put variable 'variable-comment nil) (put variable 'saved-variable-comment nil)) @@ -2112,9 +2099,9 @@ ((get symbol 'standard-value) (car (get symbol 'standard-value))) ((default-boundp symbol) - (custom-quote (funcall get symbol))) + (quote-maybe (funcall get symbol))) (t - (custom-quote (widget-get conv :value)))))) + (quote-maybe (widget-get conv :value)))))) (insert (symbol-name symbol) ": ") (push (widget-create-child-and-convert widget 'visibility @@ -2353,7 +2340,7 @@ (set-extent-property (widget-get comment-widget :comment-extent) 'invisible t)) (funcall set symbol (setq val (widget-value child))) - (put symbol 'customized-value (list (custom-quote val))) + (put symbol 'customized-value (list (quote-maybe val))) (put symbol 'variable-comment comment) (put symbol 'customized-variable-comment comment))) (custom-variable-state-set widget) @@ -2393,11 +2380,11 @@ (set-extent-property (widget-get comment-widget :comment-extent) 'invisible t)) (put symbol - 'saved-value (list (custom-quote (widget-value - child)))) + 'saved-value (list (quote-maybe (widget-value + child)))) (custom-push-theme 'theme-value symbol 'user - 'set (list (custom-quote (widget-value - child)))) + 'set (list (quote-maybe (widget-value + child)))) (funcall set symbol (widget-value child)) (put symbol 'variable-comment comment) (put symbol 'saved-variable-comment comment)))