[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 49321c0 06/19: Allow duplicate candidates in `ivy-read'
From: |
Oleh Krehel |
Subject: |
[elpa] master 49321c0 06/19: Allow duplicate candidates in `ivy-read' |
Date: |
Thu, 16 Apr 2015 12:18:09 +0000 |
branch: master
commit 49321c022d4aa3c9fb17f783ab2ee6f02462e4de
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
Allow duplicate candidates in `ivy-read'
* ivy.el (ivy-completions): Use `eq' instead of `equal' in
`cl-position'.
---
ivy.el | 6 +++---
swiper.el | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ivy.el b/ivy.el
index 3e22968..2b7af6a 100644
--- a/ivy.el
+++ b/ivy.el
@@ -393,9 +393,9 @@ CANDIDATES is a list of strings."
idx)
(setq ivy--length (length cands))
(when (and tail ivy--old-cands)
- (while (and tail
- (null (setq idx (cl-position (pop tail) cands
- :test #'equal)))))
+ (while (and tail (null idx))
+ ;; Compare with eq to handle equal duplicates in cands
+ (setq idx (cl-position (pop tail) cands)))
(setq ivy--index (or idx 0)))
(setq ivy--old-cands cands)
(when (>= ivy--index ivy--length)
diff --git a/swiper.el b/swiper.el
index 7a418c9..8a5e811 100644
--- a/swiper.el
+++ b/swiper.el
@@ -137,7 +137,7 @@
(line-beginning-position)
(line-end-position)))
candidates)
- (zerop (forward-line 1)))
+ (forward-line 1))
(nreverse candidates))))))
(defvar swiper--opoint 1
- [elpa] master updated (cf04c93 -> 22139ae), Oleh Krehel, 2015/04/16
- [elpa] master 0d619ea 10/19: counsel.el (couns-clj): Add with-no-warnings, Oleh Krehel, 2015/04/16
- [elpa] master 6dd560c 05/19: swiper.el (swiper-map): Bind "C-l" to recenter, Oleh Krehel, 2015/04/16
- [elpa] master 49321c0 06/19: Allow duplicate candidates in `ivy-read',
Oleh Krehel <=
- [elpa] master f72a860 11/19: counsel.el: Fixup prefixes, Oleh Krehel, 2015/04/16
- [elpa] master 841d59b 01/19: "C-s" should forward to "C-n" etc, Oleh Krehel, 2015/04/16
- [elpa] master 609577e 12/19: Fix invalid package header line, Oleh Krehel, 2015/04/16
- [elpa] master e816884 03/19: Default ARG to 1 for arrows, Oleh Krehel, 2015/04/16
- [elpa] master a8a1f65 02/19: Add numeric arguments to arrows, Oleh Krehel, 2015/04/16
- [elpa] master 0477214 08/19: Fix `ivy-backward-delete-char-function', Oleh Krehel, 2015/04/16
- [elpa] master 6dd1068 04/19: swiper.el (swiper-query-replace): Enable recursive minibuffers, Oleh Krehel, 2015/04/16
- [elpa] master 3b78e0e 18/19: swiper.el: Bump version, Oleh Krehel, 2015/04/16
- [elpa] master 22139ae 19/19: Merge commit '3b78e0e503f4763f8a2d77eeacfc91213ec5532e' from swiper, Oleh Krehel, 2015/04/16
- [elpa] master c59752b 16/19: Update sorting order, make sure that perfect match is selected, Oleh Krehel, 2015/04/16