[Emacs-diffs] /srv/bzr/emacs/trunk r108321: * lisp/progmodes/compile.el (compilation-error-regexp-alist-alist):

[Stefan Monnier]

------------------------------------------------------------
revno: 108321
fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=11517
committer: Stefan Monnier <address@hidden>
branch nick: trunk
timestamp: Mon 2012-05-21 00:28:41 -0400
message:
  * lisp/progmodes/compile.el (compilation-error-regexp-alist-alist):
  Simplify Maven regexp, and make sure the file can't start with a space.
modified:
  lisp/ChangeLog
  lisp/progmodes/compile.el
  test/automated/compile-tests.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-05-21 00:44:34 +0000
+++ b/lisp/ChangeLog    2012-05-21 04:28:41 +0000
@@ -1,3 +1,9 @@
+2012-05-21  Stefan Monnier  <address@hidden>
+
+       * progmodes/compile.el (compilation-error-regexp-alist-alist):
+       Simplify Maven regexp, and make sure the file can't start with a space
+       (bug#11517).
+
 2012-05-21  Glenn Morris  <address@hidden>
 
        * Makefile.in (setwins, setwins_almost, setwins_for_subdirs):

=== modified file 'lisp/progmodes/compile.el'
--- a/lisp/progmodes/compile.el 2012-05-18 01:46:20 +0000
+++ b/lisp/progmodes/compile.el 2012-05-21 04:28:41 +0000
@@ -209,7 +209,7 @@
     ;; due to matching filenames via \\(.*?\\).  This might be faster.
     (maven
      ;; Maven is a popular free software build tool for Java.
-     "\\([0-9]*[^0-9\n]\\(?:[^\n :]\\| [^-/\n]\\|:[^ 
\n]\\)*?\\):\\[\\([0-9]+\\),\\([0-9]+\\)\\] " 1 2 3)
+     "\\([^ \n]\\(?:[^\n :]\\| [^-/\n]\\|:[^ 
\n]\\)*?\\):\\[\\([0-9]+\\),\\([0-9]+\\)\\] " 1 2 3)
 
     (jikes-line
      "^ *\\([0-9]+\\)\\.[ \t]+.*\n +\\(<-*>\n\\*\\*\\* 
\\(?:Error\\|Warnin\\(g\\)\\)\\)"

=== modified file 'test/automated/compile-tests.el'
--- a/test/automated/compile-tests.el   2012-01-05 09:46:05 +0000
+++ b/test/automated/compile-tests.el   2012-05-21 04:28:41 +0000
@@ -199,6 +199,8 @@
     ;; maven
     ("FooBar.java:[111,53] no interface expected here"
      1 53 111 "FooBar.java")
+    ("  [ERROR] /Users/cinsk/hello.java:[651,96] ';' expected"
+     15 96 651 "/Users/cinsk/hello.java") ;Bug#11517.
     ;; mips-1 mips-2
     ("TrimMask (255) in solomon.c may be indistinguishable from TrimMasks (93) 
in solomo.c due to truncation"
      11 nil 255 "solomon.c")