From: Juri Linkov Date: Thu, 8 Sep 2011 12:07:52 +0000 (+0300) Subject: (grep-regexp-alist): Move dangling comment to the previous rule. X-Git-Tag: emacs-pretest-24.0.90~104^2~133 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=bfe5d7f0e34ca8264dea23e7ecadde9536c53ba1;p=emacs.git (grep-regexp-alist): Move dangling comment to the previous rule. --- diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index b3f9758bacf..000243b05df 100644 --- a/lisp/progmodes/grep.el +++ b/lisp/progmodes/grep.el @@ -343,7 +343,16 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies ;;;###autoload (defconst grep-regexp-alist - '(("^\\(.+?\\)\\(:[ \t]*\\)\\([1-9][0-9]*\\)\\2" + '( + ;; Rule to match column numbers is commented out since no known grep + ;; produces them + ;; ("^\\(.+?\\)\\(:[ \t]*\\)\\([1-9][0-9]*\\)\\2\\(?:\\([1-9][0-9]*\\)\\(?:-\\([1-9][0-9]*\\)\\)?\\2\\)?" + ;; 1 3 (4 . 5)) + ;; 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. + ("^\\(.+?\\)\\(:[ \t]*\\)\\([1-9][0-9]*\\)\\2" 1 3 ;; Calculate column positions (col . end-col) of first grep match on a line ((lambda () @@ -362,14 +371,6 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies (mend (and mbeg (next-single-property-change mbeg 'font-lock-face nil end)))) (when mend (- mend beg))))))) - ;; Rule to match column numbers is commented out since no known grep - ;; produces them - ;; ("^\\(.+?\\)\\(:[ \t]*\\)\\([0-9]+\\)\\2\\(?:\\([0-9]+\\)\\(?:-\\([0-9]+\\)\\)?\\2\\)?" - ;; 1 3 (4 . 5)) - ;; 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. ("^Binary file \\(.+\\) matches$" 1 nil nil 0 1)) "Regexp used to match grep hits. See `compilation-error-regexp-alist'.")