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

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

[elpa] master f3b2640 124/272: swiper.el (swiper--ivy): Update signature


From: Oleh Krehel
Subject: [elpa] master f3b2640 124/272: swiper.el (swiper--ivy): Update signature
Date: Mon, 25 Apr 2016 10:13:20 +0000

branch: master
commit f3b2640e41cb1cbff0114d2990f668056136ef98
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>

    swiper.el (swiper--ivy): Update signature
    
    Now takes a list of candidates, produced by something like
    `swiper--candidates'.
    This means that a user can call `swiper--ivy' with a filter applied on
    `swiper--candidates' to obtain narrowing.
---
 swiper.el |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/swiper.el b/swiper.el
index 923b647..2d46f08 100644
--- a/swiper.el
+++ b/swiper.el
@@ -310,7 +310,7 @@ numbers; replaces calculating the width from buffer line 
count."
   "`isearch' with an overview.
 When non-nil, INITIAL-INPUT is the initial search pattern."
   (interactive)
-  (swiper--ivy initial-input))
+  (swiper--ivy (swiper--candidates) initial-input))
 
 (declare-function string-trim-right "subr-x")
 
@@ -385,15 +385,14 @@ line numbers. For the buffer, use `ivy--regex' instead."
 (defvar swiper-invocation-face nil
   "The face at the point of invocation of `swiper'.")
 
-(defun swiper--ivy (&optional initial-input)
-  "`isearch' with an overview using `ivy'.
+(defun swiper--ivy (candidates &optional initial-input)
+  "Select one of CANDIDATES and move there.
 When non-nil, INITIAL-INPUT is the initial search pattern."
   (interactive)
   (swiper--init)
   (setq swiper-invocation-face
         (plist-get (text-properties-at (point)) 'face))
-  (let ((candidates (swiper--candidates))
-        (preselect
+  (let ((preselect
          (if swiper-use-visual-line
              (count-screen-lines
               (point-min)



reply via email to

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