branch: externals/ivy-hydra
commit e05bc455951eb0f9572798395b9f056e4bfc3103
Author: Oleh Krehel <[email protected]>
Commit: Oleh Krehel <[email protected]>
ivy.el (ivy--recompute-index): Take one less argument
---
counsel.el | 4 ++--
ivy.el | 20 ++++++++++----------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/counsel.el b/counsel.el
index 99132c0..7fabef6 100644
--- a/counsel.el
+++ b/counsel.el
@@ -219,12 +219,12 @@ respectively."
(if ivy--old-cands
(if (eq (ivy-alist-setting ivy-index-functions-alist)
'ivy-recompute-index-zero)
(ivy-set-index 0)
- (ivy--recompute-index ivy-text re ivy--all-candidates))
+ (ivy--recompute-index re ivy--all-candidates))
(unless (ivy-set-index
(ivy--preselect-index
(ivy-state-preselect ivy-last)
ivy--all-candidates))
- (ivy--recompute-index ivy-text re ivy--all-candidates))))
+ (ivy--recompute-index re ivy--all-candidates))))
(setq ivy--old-cands ivy--all-candidates)
(if ivy--all-candidates
(ivy--exhibit)
diff --git a/ivy.el b/ivy.el
index 168c6a5..fd2660d 100644
--- a/ivy.el
+++ b/ivy.el
@@ -3475,10 +3475,10 @@ CANDIDATES are assumed to be static."
ivy-recompute-index-swiper-async-backward
ivy-recompute-index-swiper-backward))
(progn
- (ivy--recompute-index name re-str cands)
+ (ivy--recompute-index re-str cands)
(setq ivy--old-cands (ivy--sort name cands)))
(setq ivy--old-cands (ivy--sort name cands))
- (ivy--recompute-index name re-str ivy--old-cands))
+ (ivy--recompute-index re-str ivy--old-cands))
(setq ivy--old-re re)
ivy--old-cands))))
@@ -3620,24 +3620,24 @@ no sorting is done.")
(defvar ivy--recompute-index-inhibit nil
"When non-nil, `ivy--recompute-index' is a no-op.")
-(defun ivy--recompute-index (name re-str cands)
- "Recompute index of selected candidate matching NAME.
-RE-STR is the regexp, CANDS are the current candidates."
+(defun ivy--recompute-index (re-str cands)
+ "Recompute index of selected candidate matching RE-STR.
+CANDS are the current candidates."
(let ((caller (ivy-state-caller ivy-last))
(func (or (ivy-alist-setting ivy-index-functions-alist)
#'ivy-recompute-index-zero))
- (case-fold-search (ivy--case-fold-p name))
+ (case-fold-search (ivy--case-fold-p re-str))
(preselect (ivy-state-preselect ivy-last))
(current (ivy-state-current ivy-last))
- (empty (string= name "")))
+ (empty (string= re-str "")))
(unless (or (memq this-command '(ivy-resume ivy-partial-or-done))
ivy--recompute-index-inhibit)
(ivy-set-index
- (if (or (string= name "")
+ (if (or (string= re-str "")
(and (> (length cands) 10000) (eq func
#'ivy-recompute-index-zero)))
0
(or
- (cl-position (ivy--remove-prefix "^" name)
+ (cl-position (ivy--remove-prefix "^" re-str)
cands
:test #'ivy--case-fold-string=)
(and ivy--directory
@@ -3667,7 +3667,7 @@ RE-STR is the regexp, CANDS are the current candidates."
ivy--old-cands
(cl-position current cands :test #'equal))
(funcall func re-str cands)))))
- (when (or empty (string= name "^"))
+ (when (or empty (string= re-str "^"))
(ivy-set-index
(or (ivy--preselect-index preselect cands)
ivy--index)))))
