[elpa] externals/ivy 61c1b96aad 5/5: Merge branch 'master' into externals/ivy

[Basil L. Contovounesios]

branch: externals/ivy
commit 61c1b96aade44d37f2dfc675ec7418a590387c46
Merge: 64a43fc05b ba02d535c9
Author: Basil L. Contovounesios <contovob@tcd.ie>
Commit: Basil L. Contovounesios <contovob@tcd.ie>

    Merge branch 'master' into externals/ivy
---
 ivy-test.el | 2 +-
 ivy.el      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ivy-test.el b/ivy-test.el
index e44f15db9e..462dd915c8 100644
--- a/ivy-test.el
+++ b/ivy-test.el
@@ -1476,8 +1476,8 @@ a buffer visiting a file."
 "))))
 
 (ert-deftest swiper--isearch-format ()
-  (setq swiper--isearch-start-point 0)
   (with-temp-buffer
+    (setq swiper--opoint (point-min))
     (insert
      "line0\nline1\nline line\nline line\nline5")
     (let* ((input "li")
diff --git a/ivy.el b/ivy.el
index 9b66dac917..feb065ca1f 100644
--- a/ivy.el
+++ b/ivy.el
@@ -2889,7 +2889,7 @@ When GREEDY is non-nil, join words in a greedy way."
 
 (defun ivy--regex-p (object)
   "Return OBJECT if it is a valid regular expression, else nil."
-  (ignore-errors (string-match-p object "") object))
+  (ignore-errors (ignore (string-match-p object "")) object))
 
 (defun ivy--regex-or-literal (str)
   "If STR isn't a legal regexp, escape it."