Mercurial > emacs
changeset 67797:7bdbb812b2f9
* custom.el (custom-push-theme): Fix docstring.
* cus-edit.el (custom-variable-set, custom-variable-save,
custom-variable-save): Custom-quote widget values.
(customize-save-variable): Fix custom-push-theme call.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sat, 24 Dec 2005 15:21:45 +0000 |
| parents | 8be72b1d3cad |
| children | 8eec4e57f170 |
| files | lisp/ChangeLog lisp/cus-edit.el lisp/custom.el |
| diffstat | 3 files changed, 21 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Dec 24 12:52:26 2005 +0000 +++ b/lisp/ChangeLog Sat Dec 24 15:21:45 2005 +0000 @@ -1,3 +1,11 @@ +2005-12-24 Chong Yidong <cyd@stupidchicken.com> + + * custom.el (custom-push-theme): Fix docstring. + + * cus-edit.el (custom-variable-set, custom-variable-save, + custom-variable-save): Custom-quote widget values. + (customize-save-variable): Fix custom-push-theme call. + 2005-12-24 Eli Zaretskii <eliz@gnu.org> * w32-fns.el (w32-batch-update-autoloads): New function.
--- a/lisp/cus-edit.el Sat Dec 24 12:52:26 2005 +0000 +++ b/lisp/cus-edit.el Sat Dec 24 15:21:45 2005 +0000 @@ -940,7 +940,7 @@ 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))) + (custom-push-theme 'theme-value variable 'user 'set (custom-quote value)) (cond ((string= comment "") (put variable 'variable-comment nil) (put variable 'saved-variable-comment nil)) @@ -2670,7 +2670,7 @@ (custom-comment-hide comment-widget)) (custom-variable-backup-value widget) (custom-push-theme 'theme-value symbol 'user - 'set (widget-value child)) + 'set (custom-quote (widget-value child))) (funcall set symbol (eval (setq val (widget-value child)))) (put symbol 'customized-value (list val)) (put symbol 'variable-comment comment) @@ -2682,7 +2682,7 @@ (custom-comment-hide comment-widget)) (custom-variable-backup-value widget) (custom-push-theme 'theme-value symbol 'user - 'set (widget-value child)) + 'set (custom-quote (widget-value child))) (funcall set symbol (setq val (widget-value child))) (put symbol 'customized-value (list (custom-quote val))) (put symbol 'variable-comment comment) @@ -2712,7 +2712,7 @@ (custom-comment-hide comment-widget)) (put symbol 'saved-value (list (widget-value child))) (custom-push-theme 'theme-value symbol 'user - 'set (widget-value child)) + 'set (custom-quote (widget-value child))) (funcall set symbol (eval (widget-value child))) (put symbol 'variable-comment comment) (put symbol 'saved-variable-comment comment)) @@ -2724,7 +2724,7 @@ (put symbol 'saved-value (list (custom-quote (widget-value child)))) (custom-push-theme 'theme-value symbol 'user - 'set (widget-value child)) + 'set (custom-quote (widget-value child))) (funcall set symbol (widget-value child)) (put symbol 'variable-comment comment) (put symbol 'saved-variable-comment comment)))
--- a/lisp/custom.el Sat Dec 24 12:52:26 2005 +0000 +++ b/lisp/custom.el Sat Dec 24 15:21:45 2005 +0000 @@ -637,14 +637,15 @@ \(jonadab set underline) \(gnome2 set info-xref) -The theme `subtle-hacker' says to use the same value for the variable as -the theme `gnome2'. The theme values set by each of these themes can be -changed, but only the one defined by `subtle-hacker' takes effect, because -the theme currently has the highest precedence. To change the precedence -of the themes, use `enable-theme'. +The theme `subtle-hacker' says to use the same value for the +variable as the theme `gnome2'. Therefore, the theme value of +the variable is `info-xref'. The theme value defined by +`subtle-hacker' is in effect, because that theme currently has +the highest precedence. To change the precedence of the themes, +use `enable-theme'. -The user has not customized the face; had he done that, the list would -contain an entry for the `user' theme, too. +The user has not customized the variable; had he done that, the +list would contain an entry for the `user' theme, too. See `custom-known-themes' for a list of known themes." (unless (or (eq prop 'theme-value)