procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix comparison of current values for the key-sequence :type

Browse source 
* lisp/cus-edit.el (custom-variable-modified-p): Round-trip
the option value before comparing it against the widget's value.
This mostly fixes comparison against the obsolete key-sequence
widget, but could fix other corner cases, when the widget
accepts different types as values.  (Bug#76156)

* test/lisp/cus-edit-tests.el (cus-edit-test-bug76156)
(cus-edit-test-bug76156-2): New test options.
(cus-edit-test-unedited-option): New test.
This commit is contained in:
Mauro Aranda 2025-02-15 09:26:46 -03:00 • committed by Stefan Kangas
parent 2044f6d959
commit f549cedaa2
2 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lisp/cus-edit.el
View file

@ -3054,11 +3054,18 @@ To check for other states, call `custom-variable-state'."
(let* ((form (widget-get widget :custom-form))
(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)))
(value-widget (car (widget-get widget :children)))
;; Round-trip the value, for the sake of widgets that accept
;; values of different types (e.g., the obsolete key-sequence widget
;; which takes either strings or vectors. (Bug#76156)
(value
(widget-apply value-widget :value-to-external
(widget-apply value-widget :value-to-internal
(if (default-boundp symbol)
(condition-case nil
(funcall get symbol)
(error (throw 'get-error t)))
(symbol-value symbol)))))
(orig-value (widget-value (car (widget-get widget :children)))))
(not (equal (if (memq form '(lisp mismatch))
;; Mimic `custom-variable-value-create'.

18
test/lisp/cus-edit-tests.el
View file

@ -134,5 +134,23 @@
;; No empty key/value pairs should show up.
(should-not (search-forward "key" nil t)))
(defcustom cus-edit-test-bug76156 "\C-c "
"Key-sequence option that might show up as EDITED even though it's not."
:type 'key-sequence)
(defcustom cus-edit-test-bug76156-2 [(control ?z)]
"Key-sequence option that might show up as EDITED even though it's not."
:type 'key-sequence)
(ert-deftest cus-edit-test-unedited-option ()
"Test that customizing unedited options doesn't show up as EDITED."
(dolist (option '(cus-edit-test-bug76156
cus-edit-test-bug76156-2
cus-edit-test-foo1))
(customize-option option)
(let ((widget (car custom-options)))
(should (eq (widget-get widget :custom-state) 'standard)))
(kill-buffer)))
(provide 'cus-edit-tests)
;;; cus-edit-tests.el ends here