aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2011-09-08 15:07:52 +0300
committerJuri Linkov2011-09-08 15:07:52 +0300
commitbfe5d7f0e34ca8264dea23e7ecadde9536c53ba1 (patch)
tree0b8d53de755bfd272323145cc6f163e848a1cdf4
parent2949f33b8a296064363f6416f64f535afe6b8eaa (diff)
downloademacs-bfe5d7f0e34ca8264dea23e7ecadde9536c53ba1.tar.gz
emacs-bfe5d7f0e34ca8264dea23e7ecadde9536c53ba1.zip
(grep-regexp-alist): Move dangling comment to the previous rule.
-rw-r--r--lisp/progmodes/grep.el19
1 files changed, 10 insertions, 9 deletions
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
343 343
344;;;###autoload 344;;;###autoload
345(defconst grep-regexp-alist 345(defconst grep-regexp-alist
346 '(("^\\(.+?\\)\\(:[ \t]*\\)\\([1-9][0-9]*\\)\\2" 346 '(
347 ;; Rule to match column numbers is commented out since no known grep
348 ;; produces them
349 ;; ("^\\(.+?\\)\\(:[ \t]*\\)\\([1-9][0-9]*\\)\\2\\(?:\\([1-9][0-9]*\\)\\(?:-\\([1-9][0-9]*\\)\\)?\\2\\)?"
350 ;; 1 3 (4 . 5))
351 ;; Note that we want to use as tight a regexp as we can to try and
352 ;; handle weird file names (with colons in them) as well as possible.
353 ;; E.g. we use [1-9][0-9]* rather than [0-9]+ so as to accept ":034:"
354 ;; in file names.
355 ("^\\(.+?\\)\\(:[ \t]*\\)\\([1-9][0-9]*\\)\\2"
347 1 3 356 1 3
348 ;; Calculate column positions (col . end-col) of first grep match on a line 357 ;; Calculate column positions (col . end-col) of first grep match on a line
349 ((lambda () 358 ((lambda ()
@@ -362,14 +371,6 @@ Notice that using \\[next-error] or \\[compile-goto-error] modifies
362 (mend (and mbeg (next-single-property-change mbeg 'font-lock-face nil end)))) 371 (mend (and mbeg (next-single-property-change mbeg 'font-lock-face nil end))))
363 (when mend 372 (when mend
364 (- mend beg))))))) 373 (- mend beg)))))))
365 ;; Rule to match column numbers is commented out since no known grep
366 ;; produces them
367 ;; ("^\\(.+?\\)\\(:[ \t]*\\)\\([0-9]+\\)\\2\\(?:\\([0-9]+\\)\\(?:-\\([0-9]+\\)\\)?\\2\\)?"
368 ;; 1 3 (4 . 5))
369 ;; Note that we want to use as tight a regexp as we can to try and
370 ;; handle weird file names (with colons in them) as well as possible.
371 ;; E.g. we use [1-9][0-9]* rather than [0-9]+ so as to accept ":034:" in
372 ;; file names.
373 ("^Binary file \\(.+\\) matches$" 1 nil nil 0 1)) 374 ("^Binary file \\(.+\\) matches$" 1 nil nil 0 1))
374 "Regexp used to match grep hits. See `compilation-error-regexp-alist'.") 375 "Regexp used to match grep hits. See `compilation-error-regexp-alist'.")
375 376