branch: externals/vertico
commit 99b9ef78e653422466ee14f1672af3ee7f685ca4
Author: Daniel Mendler <[email protected]>
Commit: Daniel Mendler <[email protected]>
Minor cleanup
---
extensions/vertico-multiform.el | 5 ++---
vertico.el | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/extensions/vertico-multiform.el b/extensions/vertico-multiform.el
index 5cf209f6629..de6f489c3ab 100644
--- a/extensions/vertico-multiform.el
+++ b/extensions/vertico-multiform.el
@@ -177,11 +177,10 @@ The keys in LIST can be symbols or regexps."
(cl-defmethod vertico--advice (&context (vertico-multiform-mode (eql t)) &rest
app)
(unwind-protect ;; Do not use `minibuffer-setup-hook' for idempotency.
- (progn
+ (dlet ((completion-eager-display nil)) ;; Available on Emacs 31
(vertico-multiform--toggle -1)
(add-hook 'minibuffer-setup-hook #'vertico-multiform--setup)
- (dlet ((completion-eager-display nil)) ;; Available on Emacs 31
- (apply app)))
+ (apply app))
(remove-hook 'minibuffer-setup-hook #'vertico-multiform--setup)
(vertico-multiform--toggle 1)))
diff --git a/vertico.el b/vertico.el
index 734b8daa01c..631ff1cfe5f 100644
--- a/vertico.el
+++ b/vertico.el
@@ -626,10 +626,9 @@ the stack trace is shown in the *Messages* buffer."
(cl-defgeneric vertico--advice (&rest app)
"Advice for completion function, apply APP."
(unwind-protect ;; Do not use `minibuffer-setup-hook' for idempotency.
- (progn
+ (dlet ((completion-eager-display nil)) ;; Available on Emacs 31
(add-hook 'minibuffer-setup-hook #'vertico--setup)
- (dlet ((completion-eager-display nil)) ;; Available on Emacs 31
- (apply app)))
+ (apply app))
(remove-hook 'minibuffer-setup-hook #'vertico--setup)))
(defun vertico-first ()
