procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/progmodes/grep.el (grep-regexp-alist): Tighten the regexp.

Browse source 
Fixes: debbugs:7378
This commit is contained in:
Stefan Monnier 2010-11-17 09:54:15 -05:00
parent f8d8a97bda
commit c04f2ac063
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/ChangeLog
View file

@ -1,3 +1,7 @@
2010-11-17 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/grep.el (grep-regexp-alist): Tighten the regexp (bug#7378).
2010-11-16 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/octave-mod.el: Rely on elecric-*-modes.

8
lisp/progmodes/grep.el
View file

@ -348,7 +348,11 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
;; produces them
;; ("^\\(.+?\\)\\(:[ \t]*\\)\\([0-9]+\\)\\2\\(?:\\([0-9]+\\)\\(?:-\\([0-9]+\\)\\)?\\2\\)?"
;; 1 3 (4 . 5))
("^\\(\\(.+?\\):\\([0-9]+\\):\\).*?\
;; Note that we want to use as tight a regexp as we can to try and
;; handle weird file names (with colons in them) as well as possible.
;; E.g. we use [1-9][0-9]* rather than [0-9]+ so as to accept ":034:" in
;; file names.
("^\\(\\(.+?\\):\\([1-9][0-9]*\\):\\).*?\
\\(\033\\[01;31m\\(?:\033\\[K\\)?\\)\\(.*?\\)\\(\033\\[[0-9]*m\\)"
2 3
;; Calculate column positions (beg . end) of first grep match on a line
@ -357,7 +361,7 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
(- (match-beginning 4) (match-end 1)))
.
(lambda () (- (match-end 5) (match-end 1)
(- (match-end 4) (match-beginning 4)))))
(- (match-end 4) (match-beginning 4)))))
nil 1)
("^Binary file \\(.+\\) matches$" 1 nil nil 0 1))
"Regexp used to match grep hits. See `compilation-error-regexp-alist'.")