From: Dmitry Gutov <dgutov@yandex.ru>
Date: Sat, 23 Jul 2022 12:23:56 +0000 (+0300)
Subject: Support new "binary file matches" format in Ripgrep 13
X-Git-Tag: emacs-29.0.90~1447^2~778
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=38d5e346df3e492a701801652d15b7209c394248;p=emacs.git

Support new "binary file matches" format in Ripgrep 13

* lisp/progmodes/xref.el (xref-matches-in-files):
Support new "binary file matches" format in Ripgrep 13
(bug#56624).
---

diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 0213ab3cc58..edfb62ea7a4 100644
--- a/lisp/progmodes/xref.el
+++ b/lisp/progmodes/xref.el
@@ -1821,7 +1821,8 @@ to control which program to use when looking for matches."
       (when (and (/= (point-min) (point-max))
                  (not (looking-at grep-re))
                  ;; TODO: Show these matches as well somehow?
-                 (not (looking-at "Binary file .* matches")))
+                 ;; Matching both Grep's and Ripgrep 13's messages.
+                 (not (looking-at ".*[bB]inary file.* matches")))
         (user-error "Search failed with status %d: %s" status
                     (buffer-substring (point-min) (line-end-position))))
       (while (re-search-forward grep-re nil t)