From c5d290fb3bf885466a1f02161afbdec5131d38e6 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 24 Dec 2005 15:21:45 +0000 Subject: [PATCH] * 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. --- lisp/ChangeLog | 8 ++++++++ lisp/cus-edit.el | 10 +++++----- lisp/custom.el | 17 +++++++++-------- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index db51209d918..6b2e4f72403 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,11 @@ +2005-12-24 Chong Yidong + + * 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 * w32-fns.el (w32-batch-update-autoloads): New function. diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index a7758129797..54d0fa23e52 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -940,7 +940,7 @@ If given a prefix (or a COMMENT argument), also prompt for a comment." 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 @@ Optional EVENT is the location for the menu." (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 @@ Optional EVENT is the location for the menu." (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 @@ Optional EVENT is the location for the menu." (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 @@ Optional EVENT is the location for the menu." (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))) diff --git a/lisp/custom.el b/lisp/custom.el index 46ae85c1226..2ba45c147e2 100644 --- a/lisp/custom.el +++ b/lisp/custom.el @@ -637,14 +637,15 @@ set by three different themes. Its `theme-value' property is: \(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 user has not customized the face; had he done that, the list would -contain an entry for the `user' theme, too. +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 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) -- 2.11.4.GIT