* lisp/progmodes/compile.el (compilation-error-regexp-alist-alist):

Simplify Maven regexp, and make sure the file can't start with a space.

Fixes: debbugs:11517

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 78f0e3863271b7d822cc82ac6f84221038cf6e95..f3c2426620e66908eecf0d841e9d03fd7b62e482 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-21  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * 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  <rgm@gnu.org>
 
        * Makefile.in (setwins, setwins_almost, setwins_for_subdirs):

diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index fe1b63f3048275706d76410f447257c5bfb22a58..45986591499f976fca81697b2ec138e5234013b6 100644 (file)
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -209,7 +209,7 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
     ;; 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\\)\\)\\)"

diff --git a/test/automated/compile-tests.el b/test/automated/compile-tests.el
index ad36c4296b462df860efba023fc88759dfef3b76..ecd0e8856f7be0ed5511f5a45ddf409481b6bdb7 100644 (file)
--- a/test/automated/compile-tests.el
+++ b/test/automated/compile-tests.el
@@ -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")