[Top][All Lists]

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

[elpa] externals/consult e6e732e 1/2: Remove global state consult--multi

From: ELPA Syncer
Subject: [elpa] externals/consult e6e732e 1/2: Remove global state consult--multi-align
Date: Tue, 6 Jul 2021 07:57:09 -0400 (EDT)

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

    Remove global state consult--multi-align
 consult.el | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/consult.el b/consult.el
index d3d6232..f7cf6c7 100644
--- a/consult.el
+++ b/consult.el
@@ -433,9 +433,6 @@ should not be considered as stable as the public API.")
 (defvar consult--multi-sources nil
   "Vector of currently active `consult--multi' sources.")
-(defvar consult--multi-align nil
-  "Alignment string for annotations for `consult--multi-annotate'.")
 (defvar consult--buffer-display #'switch-to-buffer
   "Buffer display function.")
@@ -1839,14 +1836,15 @@ INHERIT-INPUT-METHOD, if non-nil the minibuffer 
inherits the input method."
     (delq nil)
-(defun consult--multi-annotate (cand)
-  "Annotate candidate CAND, used by `consult--multi'."
+(defun consult--multi-annotate (align cand)
+  "Annotate candidate CAND with `consult--multi' type.
+ALIGN is the alignment string."
   (let* ((src (consult--multi-source cand))
          (annotate (plist-get src :annotate))
          (ann (if annotate
                   (funcall annotate (cdr (get-text-property 0 'consult-multi 
                 (plist-get src :name))))
-    (and ann (concat consult--multi-align ann))))
+    (and ann (concat align ann))))
 (defun consult--multi-group (cand transform)
   "Return title of candidate CAND or TRANSFORM the candidate."
@@ -1962,9 +1960,9 @@ Optional source fields:
          (candidates (consult--with-increased-gc
                       (let ((consult--cache))
-         (consult--multi-align (propertize
-                                " " 'display
-                                `(space :align-to (+ left ,(cadr 
+         (align (propertize
+                 " " 'display
+                 `(space :align-to (+ left ,(cadr candidates)))))
          (selected (apply #'consult--read
                           (caddr candidates)
@@ -1973,7 +1971,7 @@ Optional source fields:
                             :default     (car candidates)
                             :category    'consult-multi
                             :predicate   #'consult--multi-predicate
-                            :annotate    #'consult--multi-annotate
+                            :annotate    (apply-partially 
#'consult--multi-annotate align)
                             :group       #'consult--multi-group
                             :lookup      #'consult--multi-lookup
                             :preview-key (consult--multi-preview-key)

reply via email to

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