Commit 8addfa91 authored by Mauro Aranda's avatar Mauro Aranda Committed by Eli Zaretskii

Reset to the standard value when reverting session's customizations

* lisp/cus-edit.el (custom-variable-reset-saved): When there is no
previous saved value, reset to the standard value.  (Bug#15214)
parent d6f9b097
Pipeline #4530 passed with stage
in 59 minutes and 10 seconds
......@@ -3035,17 +3035,18 @@ Update the widget to show that value. The value that was current
before this operation becomes the backup value."
(let* ((symbol (widget-value widget))
(saved-value (get symbol 'saved-value))
(comment (get symbol 'saved-variable-comment)))
(comment (get symbol 'saved-variable-comment))
value)
(custom-variable-backup-value widget)
(if (not (or saved-value comment))
;; If there is no saved value, remove the setting.
(custom-push-theme 'theme-value symbol 'user 'reset)
;; Otherwise, apply the saved value.
(put symbol 'variable-comment comment)
(custom-push-theme 'theme-value symbol 'user 'set (car-safe saved-value))
(ignore-errors
(funcall (or (get symbol 'custom-set) 'set-default)
symbol (eval (car saved-value)))))
;; If there is no saved value, remove the setting.
(custom-push-theme 'theme-value symbol 'user 'reset)
(setq value (car-safe saved-value))
(custom-push-theme 'theme-value symbol 'user 'set value)
(put symbol 'variable-comment comment))
(ignore-errors
(funcall (or (get symbol 'custom-set) #'set-default) symbol
(eval (or value (car (get symbol 'standard-value))))))
(put symbol 'customized-value nil)
(put symbol 'customized-variable-comment nil)
(widget-put widget :custom-state 'unknown)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment