[Emacs-diffs] /srv/bzr/emacs/trunk r102417: * lisp/progmodes/grep.el (grep-regexp-alist): Tighten the regexp.

[Stefan Monnier]

------------------------------------------------------------
revno: 102417
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Wed 2010-11-17 09:54:15 -0500
message:
  * lisp/progmodes/grep.el (grep-regexp-alist): Tighten the regexp.
modified:
  lisp/ChangeLog
  lisp/progmodes/grep.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-11-16 21:19:34 +0000
+++ b/lisp/ChangeLog    2010-11-17 14:54:15 +0000
@@ -1,3 +1,7 @@
+2010-11-17  Stefan Monnier  <address@hidden>
+
+       * progmodes/grep.el (grep-regexp-alist): Tighten the regexp (bug#7378).
+
 2010-11-16  Stefan Monnier  <address@hidden>
 
        * progmodes/octave-mod.el: Rely on elecric-*-modes.

=== modified file 'lisp/progmodes/grep.el'
--- a/lisp/progmodes/grep.el    2010-05-21 20:43:04 +0000
+++ b/lisp/progmodes/grep.el    2010-11-17 14:54:15 +0000
@@ -348,7 +348,11 @@
     ;; 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 @@
         (- (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'.")