[elpa] externals/ivy 37f85ff970 2/2: Merge branch 'master' into externals/ivy

[Basil L. Contovounesios]

branch: externals/ivy
commit 37f85ff9707307d4055f4c94cc017925848466cf
Merge: 69a4be6b62 87c53b0362
Author: Basil L. Contovounesios <basil@contovou.net>
Commit: Basil L. Contovounesios <basil@contovou.net>

    Merge branch 'master' into externals/ivy
---
 ivy.el | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/ivy.el b/ivy.el
index 7d3f000831..3786b62de8 100644
--- a/ivy.el
+++ b/ivy.el
@@ -3614,8 +3614,11 @@ In any Ivy completion session, the case folding starts 
with
 RE is a list of cons cells, with a regexp car and a boolean cdr.
 When the cdr is t, the car must match.
 Otherwise, the car must not match."
-  (unless (member re '("" ()))
+  (if (member re '("" ()))
+      candidates
     (setq candidates (copy-sequence candidates))
+    ;; Return nil (not candidates) on error, e.g., when we try to filter
+    ;; `swiper-isearch' numeric candidates with `string-match-p'.
     (ignore-errors
       (dolist (re (if (stringp re) (list (cons re t)) re))
         (let* ((re-str (car re))
@@ -3626,8 +3629,8 @@ Otherwise, the car must not match."
           (setq candidates
                 (cl-delete nil candidates
                            (if (cdr re) :if-not :if)
-                           pred))))))
-  candidates)
+                           pred))))
+      candidates)))
 
 (defun ivy--filter (name candidates)
   "Return all items that match NAME in CANDIDATES.