[elpa] externals/vertico 8d5591fc25 2/5: Improve vertico-multiform setup

[ELPA Syncer]

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

    Improve vertico-multiform setup
---
 extensions/vertico-multiform.el | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/extensions/vertico-multiform.el b/extensions/vertico-multiform.el
index 21c8c01182..1a355bfa65 100644
--- a/extensions/vertico-multiform.el
+++ b/extensions/vertico-multiform.el
@@ -82,7 +82,7 @@ Has lower precedence than 
`vertico-multiform-command-settings'."
   "Toggle modes from stack depending on ARG."
   (when-let ((win (active-minibuffer-window))
              (modes (car vertico-multiform--stack)))
-    (when (= arg -1) (setq modes (reverse modes)))
+    (when (= arg 1) (setq modes (reverse modes)))
     (with-selected-window win
       (dolist (m modes)
         (funcall m arg)))))
@@ -107,7 +107,8 @@ The keys in LIST can be symbols or regexps."
                minibuffer-completion-predicate)
               'category))
         (exit (make-symbol "vertico-multiform--exit"))
-        (depth (recursion-depth)))
+        (depth (recursion-depth))
+        (modes nil))
     (fset exit (lambda ()
                  (when (= depth (recursion-depth))
                    (remove-hook 'minibuffer-exit-hook exit)
@@ -117,12 +118,11 @@ The keys in LIST can be symbols or regexps."
     (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)))
-                  (cdr (or (vertico-multiform--lookup this-command 
vertico-multiform-command-modes)
-                           (and cat (vertico-multiform--lookup cat 
vertico-multiform-category-modes)))))
-          vertico-multiform--stack)
+    (dolist (x (cdr (or (vertico-multiform--lookup this-command 
vertico-multiform-command-modes)
+                        (and cat (vertico-multiform--lookup cat 
vertico-multiform-category-modes)))))
+      (let ((sym (and (symbolp x) (intern-soft (format "vertico-%s-mode" x)))))
+        (push (if (and sym (fboundp sym)) sym x) modes)))
+    (push modes vertico-multiform--stack)
     (vertico-multiform--toggle 1)
     (vertico--setup)))