From ba650a7ab90d66686ba787937ac9e71f749c598e Mon Sep 17 00:00:00 2001 From: Daniel Mendler Date: Sat, 11 May 2024 22:47:21 +0200 Subject: [PATCH] Revert "Opt-out of Vertico in keyboard macros (See #478)" This reverts commit b413071021a717bc25f730d2f94ce0740a9b8e34. --- extensions/vertico-multiform.el | 12 ++++++------ vertico.el | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/extensions/vertico-multiform.el b/extensions/vertico-multiform.el index 0f17c2c..932fb76 100644 --- 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) - (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)))) + (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 index 1e395ae..4aa1459 100644 --- a/vertico.el +++ b/vertico.el @@ -643,8 +643,7 @@ The function is configured by BY, BSIZE, BINDEX, BPRED and PRED." (cl-defgeneric vertico--advice (&rest app) "Advice for completion function, apply APP." - (if (or defining-kbd-macro executing-kbd-macro) (apply app) - (minibuffer-with-setup-hook #'vertico--setup (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."