aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2006-02-20 15:59:51 +0000
committerChong Yidong2006-02-20 15:59:51 +0000
commitec9f0a62bf72630aae48ae220ed0254ebbe64993 (patch)
tree6e461b3897aed385ad4b2a3f54f9c49bb8e0838d
parent58f7100978e6647a6655a008554daf2d1bab3665 (diff)
downloademacs-ec9f0a62bf72630aae48ae220ed0254ebbe64993.tar.gz
emacs-ec9f0a62bf72630aae48ae220ed0254ebbe64993.zip
* custom.el (customize-mark-to-save, customize-mark-as-set): Load
the symbol first.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/custom.el2
2 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6276c84d09f..c08fa00897d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12006-02-20 Chong Yidong <cyd@stupidchicken.com>
2
3 * custom.el (customize-mark-to-save, customize-mark-as-set): Load
4 the symbol first.
5
12006-02-20 Juanma Barranquero <lekktu@gmail.com> 62006-02-20 Juanma Barranquero <lekktu@gmail.com>
2 7
3 * buff-menu.el (list-buffers-noselect): Turn also "\n" into a 8 * buff-menu.el (list-buffers-noselect): Turn also "\n" into a
diff --git a/lisp/custom.el b/lisp/custom.el
index bdac459daee..15b5b4a815c 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -653,6 +653,7 @@ default value. Otherwise, set it to nil.
653To actually save the value, call `custom-save-all'. 653To actually save the value, call `custom-save-all'.
654 654
655Return non-nil iff the `saved-value' property actually changed." 655Return non-nil iff the `saved-value' property actually changed."
656 (custom-load-symbol symbol)
656 (let* ((get (or (get symbol 'custom-get) 'default-value)) 657 (let* ((get (or (get symbol 'custom-get) 'default-value))
657 (value (funcall get symbol)) 658 (value (funcall get symbol))
658 (saved (get symbol 'saved-value)) 659 (saved (get symbol 'saved-value))
@@ -681,6 +682,7 @@ or else if it is different from the standard value, set the
681default value. Otherwise, set it to nil. 682default value. Otherwise, set it to nil.
682 683
683Return non-nil iff the `customized-value' property actually changed." 684Return non-nil iff the `customized-value' property actually changed."
685 (custom-load-symbol symbol)
684 (let* ((get (or (get symbol 'custom-get) 'default-value)) 686 (let* ((get (or (get symbol 'custom-get) 'default-value))
685 (value (funcall get symbol)) 687 (value (funcall get symbol))
686 (customized (get symbol 'customized-value)) 688 (customized (get symbol 'customized-value))