[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r107115: Fix presentation of type-mis
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r107115: Fix presentation of type-mismatched customization widgets. |
Date: |
Sun, 05 Feb 2012 21:41:50 +0800 |
User-agent: |
Bazaar (2.3.1) |
------------------------------------------------------------
revno: 107115
fixes bug(s): http://debbugs.gnu.org/7600
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2012-02-05 21:41:50 +0800
message:
Fix presentation of type-mismatched customization widgets.
* lisp/cus-edit.el (custom-variable-value-create): For mismatched
types, show the current value.
modified:
lisp/ChangeLog
lisp/cus-edit.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2012-02-05 08:06:37 +0000
+++ b/lisp/ChangeLog 2012-02-05 13:41:50 +0000
@@ -5,6 +5,9 @@
2012-02-05 Chong Yidong <address@hidden>
+ * cus-edit.el (custom-variable-value-create): For mismatched
+ types, show the current value (Bug#7600).
+
* custom.el (defcustom): Doc fix.
2012-02-05 Glenn Morris <address@hidden>
=== modified file 'lisp/cus-edit.el'
--- a/lisp/cus-edit.el 2012-01-28 02:56:35 +0000
+++ b/lisp/cus-edit.el 2012-02-05 13:41:50 +0000
@@ -2599,7 +2599,6 @@
:parent widget)
buttons))
((memq form '(lisp mismatch))
- ;; In lisp mode edit the saved value when possible.
(push (widget-create-child-and-convert
widget 'custom-visibility
:help-echo "Hide the value of this option."
@@ -2611,11 +2610,10 @@
t)
buttons)
(insert " ")
- (let* ((value (cond ((get symbol 'saved-value)
- (car (get symbol 'saved-value)))
- ((get symbol 'standard-value)
- (car (get symbol 'standard-value)))
- ((default-boundp symbol)
+ ;; This used to try presenting the saved value or the
+ ;; standard value, but it seems more intuitive to present
+ ;; the current value (Bug#7600).
+ (let* ((value (cond ((default-boundp symbol)
(custom-quote (funcall get symbol)))
(t
(custom-quote (widget-get conv :value))))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r107115: Fix presentation of type-mismatched customization widgets.,
Chong Yidong <=