branch: master
commit ff3eaf970dd58256ad839a179c4081a4b53331c1
Author: Oleh Krehel <[email protected]>
Commit: Oleh Krehel <[email protected]>
ivy.el (ivy--sorted-files): Always use predicate
Fixes #1121
---
ivy.el | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ivy.el b/ivy.el
index 48ff255..3b00295 100644
--- a/ivy.el
+++ b/ivy.el
@@ -1442,11 +1442,11 @@ like.")
"Sorting won't be done for collections larger than this."
:type 'integer)
-(defun ivy--sorted-files (dir &optional predicate)
+(defun ivy--sorted-files (dir)
"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)
+ (predicate (ivy-state-predicate ivy-last))
(seq (condition-case nil
(all-completions "" 'read-file-name-internal)
(error
@@ -1729,7 +1729,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 predicate))
+ (setq coll (ivy--sorted-files ivy--directory))
(when initial-input
(unless (or require-match
(equal initial-input default-directory)
