emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master 38d5e346df: Support new "binary file matches" format in Ripgrep 1


From: Dmitry Gutov
Subject: master 38d5e346df: Support new "binary file matches" format in Ripgrep 13
Date: Sat, 23 Jul 2022 08:27:55 -0400 (EDT)

branch: master
commit 38d5e346df3e492a701801652d15b7209c394248
Author: Dmitry Gutov <dgutov@yandex.ru>
Commit: Dmitry Gutov <dgutov@yandex.ru>

    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).
---
 lisp/progmodes/xref.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el
index 0213ab3cc5..edfb62ea7a 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)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]