[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/vertico 67f94bda4d 1/2: vertico-multiform: nil in verti
From: |
ELPA Syncer |
Subject: |
[elpa] externals/vertico 67f94bda4d 1/2: vertico-multiform: nil in vertico-multiform-command-modes is not ignored |
Date: |
Fri, 31 Dec 2021 04:58:21 -0500 (EST) |
branch: externals/vertico
commit 67f94bda4dbe8d15902c24a50f26891e0d88ab53
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>
vertico-multiform: nil in vertico-multiform-command-modes is not ignored
---
extensions/vertico-multiform.el | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/extensions/vertico-multiform.el b/extensions/vertico-multiform.el
index 4c69737a3b..903b6e92c6 100644
--- a/extensions/vertico-multiform.el
+++ b/extensions/vertico-multiform.el
@@ -93,7 +93,7 @@ The keys in LIST can be symbols or regexps."
if (if (symbolp (car x))
(eq key (car x))
(string-match-p (car x) (symbol-name key)))
- return (cdr x))))
+ return x)))
(defun vertico-multiform--setup ()
"Enable modes at minibuffer setup."
@@ -112,14 +112,14 @@ The keys in LIST can be symbols or regexps."
(vertico-multiform--toggle -1)
(pop vertico-multiform--stack))))
(add-hook 'minibuffer-exit-hook exit)
- (dolist (x (or (vertico-multiform--lookup this-command
vertico-multiform-command-settings)
- (and cat (vertico-multiform--lookup cat
vertico-multiform-category-settings))))
+ (dolist (x (cdr (or (vertico-multiform--lookup this-command
vertico-multiform-command-settings)
+ (and cat (vertico-multiform--lookup cat
vertico-multiform-category-settings)))))
(set (make-local-variable (car x)) (cdr x)))
(push (mapcar (lambda (m)
(let ((v (intern (format "vertico-%s-mode" m))))
(if (fboundp v) v m)))
- (or (vertico-multiform--lookup this-command
vertico-multiform-command-modes)
- (and cat (vertico-multiform--lookup cat
vertico-multiform-category-modes))))
+ (cdr (or (vertico-multiform--lookup this-command
vertico-multiform-command-modes)
+ (and cat (vertico-multiform--lookup cat
vertico-multiform-category-modes)))))
vertico-multiform--stack)
(vertico-multiform--toggle 1)
(vertico--setup)))