emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/vertico 1e3450cb67 4/4: vertico-multiform: Recognize t


From: ELPA Syncer
Subject: [elpa] externals/vertico 1e3450cb67 4/4: vertico-multiform: Recognize t key to specify default settings
Date: Sun, 2 Jan 2022 19:57:54 -0500 (EST)

branch: externals/vertico
commit 1e3450cb676b0cce8989740cee4c84cafa18b369
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>

    vertico-multiform: Recognize t key to specify default settings
---
 extensions/vertico-multiform.el | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/extensions/vertico-multiform.el b/extensions/vertico-multiform.el
index e25bcc69ac..38687f0465 100644
--- a/extensions/vertico-multiform.el
+++ b/extensions/vertico-multiform.el
@@ -63,14 +63,14 @@
 A setting can either be a mode symbol, a function or a cons cell of variable
 name and variable value. Takes precedence over `vertico-multiform-categories'."
   :group 'vertico
-  :type '(alist :key-type (choice symbol regexp) :value-type (repeat sexp)))
+  :type '(alist :key-type (choice symbol regexp (const t)) :value-type (repeat 
sexp)))
 
 (defcustom vertico-multiform-categories nil
   "Alist of categories/regexps and list of settings to turn on per category.
 A setting can either be a mode symbol, a function or a cons cell of variable
 name and value. Has lower precedence than `vertico-multiform-commands'."
   :group 'vertico
-  :type '(alist :key-type (choice symbol regexp) :value-type (repeat sexp)))
+  :type '(alist :key-type (choice symbol regexp (const t)) :value-type (repeat 
sexp)))
 
 (defvar vertico-multiform--stack nil)
 
@@ -88,9 +88,10 @@ name and value. Has lower precedence than 
`vertico-multiform-commands'."
 The keys in LIST can be symbols or regexps."
   (and (symbolp key)
        (seq-find (lambda (x)
-                   (if (symbolp (car x))
-                       (eq key (car x))
-                     (string-match-p (car x) (symbol-name key))))
+                   (cond
+                    ((eq (car x) t))
+                    ((symbolp (car x)) (eq key (car x)))
+                    ((string-match-p (car x) (symbol-name key)))))
                  list)))
 
 (defun vertico-multiform--setup ()
@@ -112,7 +113,7 @@ The keys in LIST can be symbols or regexps."
                    (pop vertico-multiform--stack))))
     (add-hook 'minibuffer-exit-hook exit)
     (dolist (x (cdr (or (vertico-multiform--lookup this-command 
vertico-multiform-commands)
-                        (and cat (vertico-multiform--lookup cat 
vertico-multiform-categories)))))
+                        (vertico-multiform--lookup cat 
vertico-multiform-categories))))
       (pcase x
         ((or (pred functionp) (pred symbolp))
          (let ((sym (and (symbolp x) (intern-soft (format "vertico-%s-mode" 
x)))))



reply via email to

[Prev in Thread] Current Thread [Next in Thread]