diff options
| author | Mattias Engdegård <mattiase@acm.org> | 2022-10-26 10:51:51 +0200 |
|---|---|---|
| committer | Mattias Engdegård <mattiase@acm.org> | 2022-10-26 10:51:51 +0200 |
| commit | e54c3959827eeee3ea60ccaa4918d22b9dce9cc5 (patch) | |
| tree | 129b3a30df477be897f7f9f91c9189774c783699 /lisp | |
| parent | 0367208e6e9cb7621eb5faa3c44b94948207c5c7 (diff) | |
| download | emacs-e54c3959827eeee3ea60ccaa4918d22b9dce9cc5.tar.gz emacs-e54c3959827eeee3ea60ccaa4918d22b9dce9cc5.tar.bz2 emacs-e54c3959827eeee3ea60ccaa4918d22b9dce9cc5.zip | |
Dynamic validation of styles in completion-category-overrides
The type of the defcustom completion-category-overrides must be able
to accommodate dynamic changes to completion-styles-alist, because
some packages (eglot) make their own additions.
This change fixes a failure in test-custom-opts. See discussion at:
https://lists.gnu.org/archive/html/emacs-devel/2022-10/msg01969.html
* lisp/minibuffer.el (completion--styles-type):
Add an "Other" case that accepts any symbol which is then validated
dynamically against completion-styles-alist.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/minibuffer.el | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el index a9f72d600de..fd878e077a1 100644 --- a/lisp/minibuffer.el +++ b/lisp/minibuffer.el @@ -975,7 +975,19 @@ and DOC describes the way this style of completion works.") (defconst completion--styles-type `(repeat :tag "insert a new menu to add more styles" (choice ,@(mapcar (lambda (x) (list 'const (car x))) - completion-styles-alist)))) + completion-styles-alist) + (symbol :tag "Other" + :validate + ,(lambda (widget) + (let ((value (widget-value widget))) + (if (assq value completion-styles-alist) + nil ; Valid. + (widget-put + widget :error + (format "Invalid completion style: %S" + value)) + widget))))))) + (defconst completion--cycling-threshold-type '(choice (const :tag "No cycling" nil) (const :tag "Always cycle" t) |