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

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

[elpa] externals/vertico 716b618791 2/2: Change flat mode indicators (Fi


From: ELPA Syncer
Subject: [elpa] externals/vertico 716b618791 2/2: Change flat mode indicators (Fix #181)
Date: Tue, 11 Jan 2022 14:58:03 -0500 (EST)

branch: externals/vertico
commit 716b618791268d14a53a4aa13f56bba6ff3fb346
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Daniel Mendler <mail@daniel-mendler.de>

    Change flat mode indicators (Fix #181)
    
    prompt {cand | cand | ...} - Candidate selected
    prompt (cand | cand | ...) - Prompt selected
    prompt [cand]              - Single matching candidate selected
---
 extensions/vertico-flat.el | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/extensions/vertico-flat.el b/extensions/vertico-flat.el
index 6c7f7d4b41..27b6adfc23 100644
--- a/extensions/vertico-flat.el
+++ b/extensions/vertico-flat.el
@@ -48,12 +48,14 @@
   :group 'vertico)
 
 (defcustom vertico-flat-format
-  '(:left       #("{" 0 1 (face minibuffer-prompt))
+  '(:multiple   #("{%s}" 0 1 (face minibuffer-prompt)
+                  3 4 (face minibuffer-prompt))
+    :single     #("[%s]" 0 1 (face minibuffer-prompt)
+                  1 3 (face success) 3 4 (face minibuffer-prompt))
+    :prompt     #("(%s)" 0 1 (face minibuffer-prompt)
+                  3 4 (face minibuffer-prompt))
     :separator  #(" | " 0 3 (face minibuffer-prompt))
-    :right      #("}" 0 1 (face minibuffer-prompt))
     :ellipsis   #("…" 0 1 (face minibuffer-prompt))
-    :only-match #("[%s]" 0 1 (face minibuffer-prompt)
-                  1 3 (face success) 3 4 (face minibuffer-prompt))
     :no-match   "[No match]")
   "Formatting strings."
   :type 'plist
@@ -77,11 +79,10 @@
            (cond
             ((and (not candidates) (plist-get vertico-flat-format :no-match)))
             ((and (= vertico--total 1) (= vertico--index 0)
-                  (when-let (fmt (plist-get vertico-flat-format :only-match))
+                  (when-let (fmt (plist-get vertico-flat-format :single))
                     (format fmt (substring-no-properties (car candidates))))))
-             (t (concat (plist-get vertico-flat-format :left)
-                        (string-join candidates (plist-get vertico-flat-format 
:separator))
-                        (plist-get vertico-flat-format :right)))))))
+            (t (format (plist-get vertico-flat-format (if (< vertico--index 0) 
:prompt :multiple))
+                       (string-join candidates (plist-get vertico-flat-format 
:separator))))))))
 
 (defun vertico-flat--arrange-candidates ()
   "Arrange candidates."



reply via email to

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