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

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

[elpa] externals/consult 54f492dd8e: Revert "consult--read: Run lookup f


From: ELPA Syncer
Subject: [elpa] externals/consult 54f492dd8e: Revert "consult--read: Run lookup function in minibuffer"
Date: Mon, 14 Nov 2022 12:57:26 -0500 (EST)

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

    Revert "consult--read: Run lookup function in minibuffer"
    
    This reverts commit 9acf9398ce187829f6afe6d33f0891ba1c07cd0d. The 
justification
    for 9acf9398ce187829f6afe6d33f0891ba1c07cd0d was invalid, since we call the
    lookup function at two times, when the minibuffer is alive, and after 
exiting.
    Therefore it makes more sense to execute the lookup always in the context 
of the
    original buffer.
---
 consult.el | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/consult.el b/consult.el
index 87bb070347..f9f9724dad 100644
--- a/consult.el
+++ b/consult.el
@@ -1537,11 +1537,11 @@ PREVIEW-KEY, STATE, TRANSFORM and CANDIDATE."
                     (lambda ()
                       (when-let ((cand (funcall candidate)))
                         (with-selected-window (active-minibuffer-window)
-                          (let* ((input (minibuffer-contents-no-properties))
-                                 (transformed (funcall transform narrow input 
cand))
-                                 (new-preview (cons input cand)))
+                          (let ((input (minibuffer-contents-no-properties))
+                                (new-preview (cons input cand)))
                             (with-selected-window (or 
(minibuffer-selected-window) (next-window))
-                              (when-let (debounce 
(consult--preview-key-debounce preview-key transformed))
+                              (when-let* ((transformed (funcall transform 
narrow input cand))
+                                          (debounce 
(consult--preview-key-debounce preview-key transformed)))
                                 (when timer
                                   (cancel-timer timer)
                                   (setq timer nil))
@@ -3011,9 +3011,7 @@ INPUT is the input string entered by the user."
             ;; Only create a new marker when jumping across buffers, to avoid
             ;; creating unnecessary markers, when scrolling through candidates.
             ;; Creating markers is not free.
-            (when (and (markerp pos)
-                       (not (eq (marker-buffer pos)
-                                (window-buffer (or 
(minibuffer-selected-window) (next-window))))))
+            (when (and (markerp pos) (not (eq (marker-buffer pos) 
(current-buffer))))
               (setq dest (move-marker (make-marker) dest (marker-buffer pos))))
             (cons dest (cdr matches))))))))
 



reply via email to

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