emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/consult a1868a7ffd: Adapt to recent Vertico changes


From: ELPA Syncer
Subject: [elpa] externals/consult a1868a7ffd: Adapt to recent Vertico changes
Date: Tue, 7 Nov 2023 18:57:36 -0500 (EST)

branch: externals/consult
commit a1868a7ffd558a3ad06ba7bb5594458f6927ebb2
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>

    Adapt to recent Vertico changes
---
 consult.el | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/consult.el b/consult.el
index 0cc5924f50..0a5e358c3f 100644
--- a/consult.el
+++ b/consult.el
@@ -5175,7 +5175,6 @@ automatically previewed."
 (defvar vertico--input)
 (declare-function vertico--exhibit "ext:vertico")
 (declare-function vertico--candidate "ext:vertico")
-(declare-function vertico--all-completions "ext:vertico")
 
 (defun consult--vertico-candidate ()
   "Return current candidate for Consult preview."
@@ -5191,11 +5190,13 @@ automatically previewed."
   "Advice for ORIG `consult--completion-filter' function.
 See `consult--completion-filter' for arguments PATTERN, CANDS, CATEGORY
 and HIGHLIGHT."
-  (if (and (bound-and-true-p vertico-mode) (not highlight))
+  (if (and (not highlight)
+           (bound-and-true-p vertico-mode)
+           (fboundp 'vertico--filter-completions))
       ;; Optimize `consult--completion-filter' using the deferred highlighting
       ;; from Vertico.  The advice is not necessary - it is a pure 
optimization.
-      (nconc (car (vertico--all-completions pattern cands nil (length pattern)
-                                            `(metadata (category . 
,category))))
+      (nconc (car (vertico--filter-completions pattern cands nil (length 
pattern)
+                                               `(metadata (category . 
,category))))
              nil)
     (funcall orig pattern cands category highlight)))
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]