[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 283fd5f: Don't discard customizations in progress w
[Emacs-diffs] master 283fd5f: Don't discard customizations in progress when adding comments (Bug#5358)
Fri, 27 Sep 2019 12:06:44 -0400 (EDT)
Author: Mauro Aranda <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
Don't discard customizations in progress when adding comments (Bug#5358)
* lisp/cus-edit.el (custom-comment-show): Add docstring. Save the
widget value in the :shown-value property, before redrawing.
(custom-variable-modified-p): New function, to complement the return
values of custom-variable-state.
(custom-variable-state-set): Use it.
(custom-face-value-create): Add children to the custom-face widget
before setting the state, to be able to check for user edits.
(custom-face-state-set): Check for user edits before calling
(custom-test-show-comment-preserves-changes): New test.
lisp/cus-edit.el | 64 ++++++++++++++++++++++++++++++++++++++---------
test/lisp/custom-tests.el | 28 +++++++++++++++++++++
2 files changed, 80 insertions(+), 12 deletions(-)
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 2496963..b9fd3e0 100644
@@ -2416,9 +2416,21 @@ If INITIAL-STRING is non-nil, use that rather than
;; Those functions are for the menu. WIDGET is NOT the comment widget. It's
;; the global custom one
(defun custom-comment-show (widget)
- (widget-put widget :comment-shown t)
- (custom-redraw widget)
+ "Show the comment editable field that belongs to WIDGET."
+ (let ((child (car (widget-get widget :children)))
+ ;; Just to be safe, we will restore this value after redrawing.
+ (old-shown-value (widget-get widget :shown-value)))
+ (widget-put widget :comment-shown t)
+ ;; Save the changes made by the user before redrawing, to avoid
+ ;; losing customizations in progress. (Bug#5358)
+ (if (eq (widget-type widget) 'custom-face)
+ (if (eq (widget-type child) 'custom-face-edit)
+ (widget-put widget :shown-value `((t ,(widget-value child))))
+ (widget-put widget :shown-value (widget-value child)))
+ (widget-put widget :shown-value (list (widget-value child))))
+ (custom-redraw widget)
+ (widget-put widget :shown-value old-shown-value)
(defun custom-comment-invisible-p (widget)
(let ((val (widget-value (widget-get widget :comment-widget))))
@@ -2810,12 +2822,35 @@ Possible return values are `standard', `saved', `set',
+(defun custom-variable-modified-p (widget)
+ "Non-nil if the variable value of WIDGET has been modified.
+WIDGET should be a custom-variable widget, whose first child is the widget
+that holds the value.
+Modified means that the widget that holds the value has been edited by the user
+in a customize buffer.
+To check for other states, call `custom-variable-state'."
+ (catch 'get-error
+ (let* ((symbol (widget-get widget :value))
+ (get (or (get symbol 'custom-get) 'default-value))
+ (value (if (default-boundp symbol)
+ (condition-case nil
+ (funcall get symbol)
+ (error (throw 'get-error t)))
+ (symbol-value symbol))))
+ (not (equal value (widget-value (car (widget-get widget :children))))))))
(defun custom-variable-state-set (widget &optional state)
"Set the state of WIDGET to STATE.
-If STATE is nil, the value is computed by `custom-variable-state'."
+If STATE is nil, the new state is computed by `custom-variable-modified-p' if
+WIDGET has been edited in the Custom buffer, or by `custom-variable-state'
(widget-put widget :custom-state
- (or state (custom-variable-state (widget-value widget)
- (widget-get widget :value)))))
+ (or state
+ (and (custom-variable-modified-p widget) 'modified)
+ (custom-variable-state (widget-value widget)
+ (widget-get widget :children)))))))
(defun custom-variable-standard-value (widget)
(get (widget-value widget) 'standard-value))
@@ -3635,9 +3670,9 @@ the present value is saved to its :shown-value property
(insert-char ?\s indent))
widget 'sexp :value spec))))
- (custom-face-state-set widget)
- (push editor children)
- (widget-put widget :children children))))))
+ (push editor children)
+ (widget-put widget :children children)
+ (custom-face-state-set widget))))))
`(("Set for Current Session" custom-face-set)
@@ -3723,9 +3758,14 @@ This is one of `set', `saved', `changed', `themed', or
(defun custom-face-state-set (widget)
- "Set the state of WIDGET."
- (widget-put widget :custom-state
- (custom-face-state (widget-value widget))))
+ "Set the state of WIDGET, a custom-face widget.
+If the user edited the widget, set the state to modified. If not, the new
+state is one of the return values of `custom-face-state'."
+ (let ((face (widget-value widget)))
+ (widget-put widget :custom-state
+ (if (face-spec-match-p face (custom-face-widget-to-spec
+ (custom-face-state face)
(defun custom-face-action (widget &optional event)
"Show the menu for `custom-face' WIDGET.
diff --git a/test/lisp/custom-tests.el b/test/lisp/custom-tests.el
index 0c49db6..270acda 100644
@@ -21,6 +21,10 @@
+(require 'seq) ; For `seq-find'.
(ert-deftest custom-theme--load-path ()
"Test `custom-theme--load-path' behavior."
(let ((tmpdir (file-name-as-directory (make-temp-file "custom-tests-" t))))
@@ -123,4 +127,28 @@
(should (equal custom--test-user-option 'baz))
(should (equal custom--test-variable 'baz))))
+;; This tests Bug#5358.
+(ert-deftest custom-test-show-comment-preserves-changes ()
+ "Test that adding a comment doesn't discard modifications in progress."
+ (customize-option 'custom--test-user-option)
+ (let* ((field (seq-find (lambda (widget)
+ (eq custom--test-user-option (widget-value
+ (parent (widget-get field :parent))
+ (origvalue (widget-value field)))
+ ;; Move to the end of the text of the widget, and modify it. This
+ ;; modification should be preserved after showing the comment field.
+ (goto-char (widget-field-text-end field))
+ (insert "bar")
+ (custom-comment-show parent)
+ ;; From now on, must use `widget-at' to get the value of the widget.
+ (should-not (eq origvalue (widget-value (widget-at))))
+ (should (eq (widget-get parent :custom-state) 'modified))
+ (should (eq (widget-value (widget-at))
+ (widget-apply field
+ (widget-apply field :value-to-internal
;;; custom-tests.el ends here
|[Prev in Thread]
||[Next in Thread]|
- [Emacs-diffs] master 283fd5f: Don't discard customizations in progress when adding comments (Bug#5358),
Lars Ingebrigtsen <=