[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 79ffa67 009/348: ivy.el (ivy--filter): Recompute index aft
From: |
Oleh Krehel |
Subject: |
[elpa] master 79ffa67 009/348: ivy.el (ivy--filter): Recompute index after sort |
Date: |
Sat, 8 Apr 2017 11:03:14 -0400 (EDT) |
branch: master
commit 79ffa6785895c25271baf9d2931a74c114ca8574
Author: justbur <address@hidden>
Commit: justbur <address@hidden>
ivy.el (ivy--filter): Recompute index after sort
Fixes #484
---
ivy.el | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/ivy.el b/ivy.el
index 8e7016b..a1bda77 100644
--- a/ivy.el
+++ b/ivy.el
@@ -2148,14 +2148,15 @@ CANDIDATES are assumed to be static."
ivy--old-cands)))
(t
(ivy--re-filter re candidates)))))
- (ivy--recompute-index name re-str cands)
- (setq ivy--old-re
- (if (eq ivy--regex-function 'ivy--regex-ignore-order)
- re
- (if cands
- re-str
- "")))
- (setq ivy--old-cands (ivy--sort name cands))))))
+ (prog1
+ (setq ivy--old-cands (ivy--sort name cands))
+ (ivy--recompute-index name re-str ivy--old-cands)
+ (setq ivy--old-re
+ (if (eq ivy--regex-function 'ivy--regex-ignore-order)
+ re
+ (if ivy--old-cands
+ re-str
+ ""))))))))
(defun ivy--set-candidates (x)
"Update `ivy--all-candidates' with X."
- [elpa] master c875668 010/348: counsel.el (counsel-mode-map): Add counsel-info-lookup-symbol, (continued)
- [elpa] master c875668 010/348: counsel.el (counsel-mode-map): Add counsel-info-lookup-symbol, Oleh Krehel, 2017/04/08
- [elpa] master b7b4758 007/348: ivy.el: Autoload ivy-read, Oleh Krehel, 2017/04/08
- [elpa] master 4a24514 001/348: doc/Changelog.org: Improve for export to HTML, Oleh Krehel, 2017/04/08
- [elpa] master 778c615 013/348: ivy.el (ivy-add-actions): New function, Oleh Krehel, 2017/04/08
- [elpa] master fd4fd36 011/348: ivy-hydra.el: Fix hydra self-install, Oleh Krehel, 2017/04/08
- [elpa] master ff415c0 012/348: fixed typos, Oleh Krehel, 2017/04/08
- [elpa] master 23d7c74 015/348: Fix previous commit, Oleh Krehel, 2017/04/08
- [elpa] master 6c669ff 014/348: File sorting function using a priority order for extensions, Oleh Krehel, 2017/04/08
- [elpa] master 9407b21 021/348: swiper.el (swiper-action-recenter): New defcustom, Oleh Krehel, 2017/04/08
- [elpa] master f3690b6 019/348: Make "M-o j" consistent for ivy-switch-buffer and counsel-find-file, Oleh Krehel, 2017/04/08
- [elpa] master 79ffa67 009/348: ivy.el (ivy--filter): Recompute index after sort,
Oleh Krehel <=
- [elpa] master c2646d4 020/348: counsel.el (counsel-load-theme-action): Update, Oleh Krehel, 2017/04/08
- [elpa] master aadc062 024/348: ivy-test.el: Add a provide statement, Oleh Krehel, 2017/04/08
- [elpa] master eba0d9e 008/348: swiper.el (swiper--ivy): Remove interactive, Oleh Krehel, 2017/04/08
- [elpa] master c20867b 022/348: ivy-hydra.el: Add package tags, Oleh Krehel, 2017/04/08
- [elpa] master 37a9629 018/348: ivy.el (ivy--reset-state): Fix ivy-resume for files, Oleh Krehel, 2017/04/08
- [elpa] master c4775b6 031/348: ivy.el (ivy-action-wrap): New defcustom, Oleh Krehel, 2017/04/08
- [elpa] master ac1dc5b 034/348: counsel.el (counsel-company): New command, Oleh Krehel, 2017/04/08
- [elpa] master cba67e4 038/348: counsel.el (counsel-bookmark): Add require, Oleh Krehel, 2017/04/08
- [elpa] master 3d48093 027/348: counsel.el (counsel--gg-sentinel): Add a work around, Oleh Krehel, 2017/04/08
- [elpa] master ddb4681 025/348: counsel.el (counsel-git-grep-cmd-default): New defvar, Oleh Krehel, 2017/04/08