aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2012-02-05 23:50:36 +0800
committerChong Yidong2012-02-05 23:50:36 +0800
commit5c2a252fadc5e9129d34393688171e221cbb10ca (patch)
treef26a5573a0e3413a909f0d8c4e3ef08506b66b5b
parentaa4589a7cfb435c704549855b1f19e335bcf3b20 (diff)
downloademacs-5c2a252fadc5e9129d34393688171e221cbb10ca.tar.gz
emacs-5c2a252fadc5e9129d34393688171e221cbb10ca.zip
Fix custom-variable-reset-backup's use of customized-value property.
* cus-edit.el (custom-variable-reset-backup): Quote the value before storing it in the customized-value property. Fixes: debbugs:6712
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/cus-edit.el2
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 93dd50b5ecb..17cb98be604 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12012-02-05 Chong Yidong <cyd@gnu.org> 12012-02-05 Chong Yidong <cyd@gnu.org>
2 2
3 * cus-edit.el (custom-variable-reset-backup): Quote the value
4 before storing it in the customized-value property (Bug#6712).
5
3 * wid-edit.el (widget-field-value-get): New optional arg to 6 * wid-edit.el (widget-field-value-get): New optional arg to
4 suppress trailing whitespace truncation. 7 suppress trailing whitespace truncation.
5 (character): Use it (Bug#2689). 8 (character): Use it (Bug#2689).
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index d7b1b6f94fb..e4d87b89450 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -3071,7 +3071,7 @@ to switch between two values."
3071 (funcall set symbol (car value)) 3071 (funcall set symbol (car value))
3072 (error nil))) 3072 (error nil)))
3073 (error "No backup value for %s" symbol)) 3073 (error "No backup value for %s" symbol))
3074 (put symbol 'customized-value (list (car value))) 3074 (put symbol 'customized-value (list (custom-quote (car value))))
3075 (put symbol 'variable-comment comment) 3075 (put symbol 'variable-comment comment)
3076 (put symbol 'customized-variable-comment comment) 3076 (put symbol 'customized-variable-comment comment)
3077 (custom-variable-state-set widget) 3077 (custom-variable-state-set widget)