Don't error on incomplete bad regexp in counsel-git-grep

counsel.el (counsel-git-grep-matcher): Update.

diff --git a/counsel.el b/counsel.el
index ea5496e8218b4f0a1903badcb49a3304a8bf2b2b..194322f2a5b3d8c172166c1fafead3ec79794f4d 100644 (file)
--- a/counsel.el
+++ b/counsel.el
@@ -250,19 +250,20 @@
               :unwind #'swiper--cleanup)))
 
 (defun counsel-git-grep-matcher (x)
-  (when (string-match "^[^:]+:[^:]+:" x)
-    (setq x (substring x (match-end 0)))
-    (if (stringp ivy--old-re)
-        (string-match ivy--old-re x)
-      (let ((res t))
-        (dolist (re ivy--old-re)
-          (setq res
-                (and res
-                     (ignore-errors
-                       (if (cdr re)
-                           (string-match (car re) x)
-                         (not (string-match (car re) x)))))))
-        res))))
+  (ignore-errors
+    (when (string-match "^[^:]+:[^:]+:" x)
+      (setq x (substring x (match-end 0)))
+      (if (stringp ivy--old-re)
+          (string-match ivy--old-re x)
+        (let ((res t))
+          (dolist (re ivy--old-re)
+            (setq res
+                  (and res
+                       (ignore-errors
+                         (if (cdr re)
+                             (string-match (car re) x)
+                           (not (string-match (car re) x)))))))
+          res)))))
 
 (defun counsel-locate-function (str &rest _u)
   (if (< (length str) 3)