branch: externals/vertico
commit a770d33df0c1cce5c130a3c719da8864006bcb65
Author: Daniel Mendler <m...@daniel-mendler.de>
Commit: Daniel Mendler <m...@daniel-mendler.de>
Rename format-candidates to arrange-candidates
---
extensions/vertico-flat.el | 8 ++++----
vertico.el | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/extensions/vertico-flat.el b/extensions/vertico-flat.el
index 98044d4..f167b18 100644
--- a/extensions/vertico-flat.el
+++ b/extensions/vertico-flat.el
@@ -54,8 +54,8 @@
(plist-get vertico-flat-format :right))
(plist-get vertico-flat-format :no-match)))))
-(defun vertico-flat--format-candidates (_metadata)
- "Format candidates."
+(defun vertico-flat--arrange-candidates (_metadata)
+ "Arrange candidates."
(let* ((index (max 0 vertico--index))
(count vertico-count)
(candidates (nthcdr vertico--index vertico--candidates))
@@ -91,10 +91,10 @@
:global t
(cond
(vertico-flat-mode
- (advice-add #'vertico--format-candidates :override
#'vertico-flat--format-candidates)
+ (advice-add #'vertico--arrange-candidates :override
#'vertico-flat--arrange-candidates)
(advice-add #'vertico--display-candidates :override
#'vertico-flat--display))
(t
- (advice-remove #'vertico--format-candidates
#'vertico-flat--format-candidates)
+ (advice-remove #'vertico--arrange-candidates
#'vertico-flat--arrange-candidates)
(advice-remove #'vertico--display-candidates #'vertico-flat--display))))
(provide 'vertico-flat)
diff --git a/vertico.el b/vertico.el
index dcaf434..9e2ec08 100644
--- a/vertico.el
+++ b/vertico.el
@@ -433,8 +433,8 @@ See `resize-mini-windows' for documentation."
(add-face-text-property 0 (length cand) 'vertico-current 'append cand))
cand)
-(defun vertico--format-candidates (metadata)
- "Format current candidates with METADATA."
+(defun vertico--arrange-candidates (metadata)
+ "Arrange candidates given the current METADATA."
(let ((curr-line 0) (lines))
;; Compute group titles
(let* ((start (min (max 0 (- vertico--index (/ vertico-count 2) (1- (mod
vertico-count 2))))
@@ -553,7 +553,7 @@ See `resize-mini-windows' for documentation."
(vertico--update-candidates pt content bounds metadata))
(vertico--prompt-selection)
(vertico--display-count)
- (vertico--display-candidates (vertico--format-candidates metadata))))
+ (vertico--display-candidates (vertico--arrange-candidates metadata))))
(defun vertico--allow-prompt-selection-p ()
"Return t if prompt can be selected."
