[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master 530b7de 246/348: ivy.el: Use predicate when reading file n
From: |
Oleh Krehel |
Subject: |
[elpa] master 530b7de 246/348: ivy.el: Use predicate when reading file names |
Date: |
Sat, 8 Apr 2017 11:04:06 -0400 (EDT) |
branch: master
commit 530b7de49c32c59d7f5c9f8b1c6dc19ef06390ec
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>
ivy.el: Use predicate when reading file names
* ivy.el (ivy--sorted-files): Add optional arg.
(ivy--reset-state): Update.
Fixes #804
---
ivy.el | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/ivy.el b/ivy.el
index 6ff0fe8..9ba6db5 100644
--- a/ivy.el
+++ b/ivy.el
@@ -1312,8 +1312,9 @@ like.")
"Sorting won't be done for collections larger than this."
:type 'integer)
-(defun ivy--sorted-files (dir)
+(defun ivy--sorted-files (dir &optional predicate)
"Return the list of files in DIR.
+When PREDICATE is not nil, use it to filter the result.
Directories come first."
(let* ((default-directory dir)
(seq (condition-case nil
@@ -1334,7 +1335,9 @@ Directories come first."
(setq seq (cl-sort seq sort-fn)))
(dolist (dir ivy-extra-directories)
(push dir seq))
- seq)))
+ (if predicate
+ (cl-remove-if-not predicate seq)
+ seq))))
(defvar ivy-recursive-restore t
"When non-nil, restore the above state when exiting the minibuffer.
@@ -1571,7 +1574,7 @@ This is useful for recursive `ivy-read'."
(setf
(ivy-state-preselect state)
(setq preselect (file-name-nondirectory preselect)))))
- (setq coll (ivy--sorted-files ivy--directory))
+ (setq coll (ivy--sorted-files ivy--directory predicate))
(when initial-input
(unless (or require-match
(equal initial-input default-directory)
- [elpa] master 778c325 183/348: ivy.el (ivy-call): Don't switch windows for 'identity action, (continued)
- [elpa] master 778c325 183/348: ivy.el (ivy-call): Don't switch windows for 'identity action, Oleh Krehel, 2017/04/08
- [elpa] master 1e96d20 201/348: ivy-overlay.el (ivy-display-function-overlay): Fix up, Oleh Krehel, 2017/04/08
- [elpa] master f5276b0 180/348: Add char-fold-to-regexp option to swiper, Oleh Krehel, 2017/04/08
- [elpa] master 9f5f6e0 202/348: ivy-overlay.el (ivy-overlay-cleanup): Fixup, Oleh Krehel, 2017/04/08
- [elpa] master 74d83ab 216/348: Sort virtual buffers after open buffers., Oleh Krehel, 2017/04/08
- [elpa] master 17f8fb3 219/348: ivy.el (ivy-switch-buffer-other-window): Obey ivy-ignore-buffers, Oleh Krehel, 2017/04/08
- [elpa] master 07388d0 226/348: Shrink ivy to suitable height when reading actions., Oleh Krehel, 2017/04/08
- [elpa] master 2237916 223/348: ivy.el (ivy-call): setq default-directory instead of let, Oleh Krehel, 2017/04/08
- [elpa] master 1d97984 227/348: Ensure that ivy--regex-ignore-order always returns legal regexps, Oleh Krehel, 2017/04/08
- [elpa] master 7e02815 235/348: Fix counsel-rg to follow matching candidate, Oleh Krehel, 2017/04/08
- [elpa] master 530b7de 246/348: ivy.el: Use predicate when reading file names,
Oleh Krehel <=
- [elpa] master 1c801a0 243/348: Ignore TAGS buffers in swiper-all, Oleh Krehel, 2017/04/08
- [elpa] master 6519ecc 248/348: ivy.el (ivy-call): Don't mess with default-directory, Oleh Krehel, 2017/04/08
- [elpa] master 721db4c 244/348: counsel.el (counsel-grep-post-action-hook): New hook for counsel-ag/grep/pt, Oleh Krehel, 2017/04/08
- [elpa] master 49acd4c 242/348: Remap scroll-up/down-command instead of assigning C-v/M-v so page up/down works, Oleh Krehel, 2017/04/08
- [elpa] master c322613 240/348: ivy.el (ivy--magic-file-slash): Fix pasting "/etc/", Oleh Krehel, 2017/04/08
- [elpa] master 1304925 239/348: ivy.el (ivy--directory-done): Fix broken "/ssh:", Oleh Krehel, 2017/04/08
- [elpa] master 359a6c8 241/348: Address multiple problems with counsel-rg, Oleh Krehel, 2017/04/08
- [elpa] master 2ed3da4 252/348: counsel.el: Fix byte-compile warning, Oleh Krehel, 2017/04/08
- [elpa] master 09da543 253/348: swiper.el: Ease the creation of swiper-in-region functions, Oleh Krehel, 2017/04/08
- [elpa] master 3940f17 266/348: Fix typos, Oleh Krehel, 2017/04/08