diff options
| -rw-r--r-- | lisp/cus-edit.el | 1 | ||||
| -rw-r--r-- | lisp/custom.el | 10 | ||||
| -rw-r--r-- | lisp/wid-edit.el | 1 |
3 files changed, 12 insertions, 0 deletions
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el index 1f496af7d57..50dce5ee285 100644 --- a/lisp/cus-edit.el +++ b/lisp/cus-edit.el @@ -1075,6 +1075,7 @@ plain variables. This means that `setopt' will execute any (when-let ((type (get variable 'custom-type))) (unless (widget-apply (widget-convert type) :match value) (user-error "Value `%S' does not match type %s" value type))) + (put variable 'custom-check-value (list value)) (funcall (or (get variable 'custom-set) #'set-default) variable value)) ;;;###autoload 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 diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el index 29b6e13bc60..53626182470 100644 --- a/lisp/wid-edit.el +++ b/lisp/wid-edit.el @@ -880,6 +880,7 @@ The child is converted, using the keyword arguments ARGS." "Make a deep copy of WIDGET." (widget-apply (copy-sequence widget) :copy)) +;;;###autoload (defun widget-convert (type &rest args) "Convert TYPE to a widget without inserting it in the buffer. The optional ARGS are additional keyword arguments." |