[elpa] master 485abbb 2/2: Merge commit 'cb5ae17997a9ec239cf9d486feceb80acb433754' from swiper

[Oleh Krehel]

branch: master
commit 485abbbdf8c2ae2a053512b259a59a5c0714fb6d
Merge: ef24701 cb5ae17
Author: Oleh Krehel <address@hidden>
Commit: Oleh Krehel <address@hidden>

    Merge commit 'cb5ae17997a9ec239cf9d486feceb80acb433754' from swiper
---
 packages/swiper/ivy.el |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/swiper/ivy.el b/packages/swiper/ivy.el
index bb0306a..d374dea 100644
--- a/packages/swiper/ivy.el
+++ b/packages/swiper/ivy.el
@@ -4,7 +4,7 @@
 
 ;; Author: Oleh Krehel <address@hidden>
 ;; URL: https://github.com/abo-abo/swiper
-;; Version: 0.2.2
+;; Version: 0.2.3
 ;; Package-Requires: ((emacs "24.1"))
 ;; Keywords: matching
 
@@ -256,15 +256,15 @@ DEF is the default value.
 _INHERIT-INPUT-METHOD is ignored for now.
 
 The history, defaults and input-method arguments are ignored for now."
-  (cond ((functionp collection)
-         (setq collection (all-completions "" collection))
+  (cond ((or (functionp collection)
+             (vectorp collection))
+         (setq collection (all-completions "" collection predicate))
+         ;; find-file is problematic
          (setq initial-input nil))
         ((hash-table-p collection)
          (error "Hash table as a collection unsupported"))
         ((listp (car collection))
-         (setq collection (mapcar #'car collection))))
-  (when predicate
-    (setq collection (cl-remove-if-not predicate collection)))
+         (setq collection (all-completions "" collection predicate))))
   (when (listp def)
     (setq def (car def)))
   (setq ivy-require-match require-match)