Opt-out of Vertico in keyboard macros (See #478)

minad · May 4, 2024 · b413071 · b413071
1 parent 1def56a
commit b413071
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/extensions/vertico-multiform.el b/extensions/vertico-multiform.el
@@ -155,12 +155,12 @@ The keys in LIST can be symbols or regexps."
     (push `(vertico--input . ,vertico-multiform-map) minor-mode-map-alist)))
 
 (cl-defmethod vertico--advice (&context (vertico-multiform-mode (eql t)) &rest app)
-  (unwind-protect
-      (progn
-        (vertico-multiform--toggle -1)
-        (minibuffer-with-setup-hook #'vertico-multiform--setup
-          (apply app)))
-    (vertico-multiform--toggle 1)))
+  (if (or defining-kbd-macro executing-kbd-macro) (apply app)
+    (unwind-protect
+        (progn
+          (vertico-multiform--toggle -1)
+          (minibuffer-with-setup-hook #'vertico-multiform--setup (apply app)))
+      (vertico-multiform--toggle 1))))
 
 (defun vertico-multiform--temporary-mode (mode arg)
   "Enable or disable MODE temporarily in minibuffer given ARG.

diff --git a/vertico.el b/vertico.el
@@ -643,7 +643,8 @@ The function is configured by BY, BSIZE, BINDEX, BPRED and PRED."
 
 (cl-defgeneric vertico--advice (&rest app)
   "Advice for completion function, apply APP."
-  (minibuffer-with-setup-hook #'vertico--setup (apply app)))
+  (if (or defining-kbd-macro executing-kbd-macro) (apply app)
+    (minibuffer-with-setup-hook #'vertico--setup (apply app))))
 
 (defun vertico-first ()
   "Go to first candidate, or to the prompt when the first candidate is selected."