[Emacs-diffs] /srv/bzr/emacs/trunk r105685: (grep-regexp-alist): Move dangling comment to the previous rule.

[Juri Linkov]

------------------------------------------------------------
revno: 105685
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Thu 2011-09-08 15:07:52 +0300
message:
  (grep-regexp-alist): Move dangling comment to the previous rule.
modified:
  lisp/progmodes/grep.el

=== modified file 'lisp/progmodes/grep.el'
--- a/lisp/progmodes/grep.el    2011-09-07 12:00:52 +0000
+++ b/lisp/progmodes/grep.el    2011-09-08 12:07:52 +0000
@@ -343,7 +343,16 @@
 
 ;;;###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 @@
                 (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'.")