emacs-elpa-diffs
[Top][All Lists]
Advanced

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

[elpa] externals/ack 40076b5 2/2: Fix #13: Fix line number false match i


From: Stefan Monnier
Subject: [elpa] externals/ack 40076b5 2/2: Fix #13: Fix line number false match in ack-error-regexp-alist
Date: Tue, 23 Feb 2021 12:40:27 -0500 (EST)

branch: externals/ack
commit 40076b5b5fd3e3eedc762f5dfa99eadfd11a2341
Author: Jake Nelson <jake.nelson@gmail.com>
Commit: João Távora <joaotavora@gmail.com>

    Fix #13: Fix line number false match in ack-error-regexp-alist
    
    Fix parsing of filename and line number as a result of "git grep" with
    filenames of the format abc-123-def.txt.  123 would mistakenly be
    taken for line numbers.
    
    Co-authored-by: João Távora <joaotavora@gmail.com>
    Copyright-paperwork-exempt: yes
    
    * ack.el (ack-error-regexp-alist): Fix regexp, removing alternation
      between : and -
---
 ack.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ack.el b/ack.el
index 6d8a651..0354f2c 100644
--- a/ack.el
+++ b/ack.el
@@ -269,7 +269,7 @@ This gets tacked on the end of the generated expressions.")
      nil nil (4 compilation-column-face nil t))
     ;; None grouping line (--nogroup or --noheading). Avoid matching
     ;; 'Ack started at Thu Jun 6 12:27:53'.
-    
("^\\(.+?\\)\\(:\\|-\\)\\([1-9][0-9]*\\)\\2\\(?:\\(?:\\(?4:[1-9][0-9]*\\)\\2\\)\\|[^0-9\n]\\|[0-9][^0-9\n]\\|...\\)"
+    
("^\\(.+?\\)\\(:\\)\\([1-9][0-9]*\\)\\2\\(?:\\(?:\\(?4:[1-9][0-9]*\\)\\2\\)\\|[^0-9\n]\\|[0-9][^0-9\n]\\|...\\)"
      1 3 (ack--column-start . ack--column-end)
      nil 1 (4 compilation-column-face nil t))
     ("^Binary file \\(.+\\) matches$" 1 nil nil 0 1))



reply via email to

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