From 6d8638e5e494fb0ceafffe19bbf349fff643e12d Mon Sep 17 00:00:00 2001 From: Lars Ingebrigtsen Date: Tue, 5 Jul 2022 19:32:37 +0200 Subject: Give a warning if setopt has been used with an invalid value * lisp/cus-edit.el (setopt--set): Mark the variable for checking. * lisp/custom.el (custom-initialize-reset): Give a warning if the type is wrong (bug#56400). * lisp/wid-edit.el (widget-convert): Autoload. --- lisp/custom.el | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'lisp/custom.el') diff --git a/lisp/custom.el b/lisp/custom.el index 2b7621229d9..a6e2ab351d4 100644 --- a/lisp/custom.el +++ b/lisp/custom.el @@ -90,6 +90,16 @@ The value is either the symbol's current value (as obtained using the `:get' function), if any, or the value in the symbol's `saved-value' property if any, or (last of all) the value of EXP." + ;; If this value has been set with `setopt' (for instance in + ;; ~/.emacs), we didn't necessarily know the type of the user option + ;; then. So check now, and issue a warning if it's wrong. + (when-let ((value (get symbol 'custom-check-value)) + (type (get symbol 'custom-type))) + (when (and (boundp symbol) + (eq (car value) (symbol-value symbol)) + ;; Check that the type is correct. + (not (widget-apply (widget-convert type) :match (car value)))) + (warn "Value `%S' for `%s' does not match type %s" value symbol type))) (funcall (or (get symbol 'custom-set) #'set-default-toplevel-value) symbol (condition-case nil -- cgit v1.2.3