From 5814f126ba1b8457c963e91c48a5bfa8108d55ac Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 21 May 2012 00:28:41 -0400 Subject: [PATCH] * 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 --- lisp/ChangeLog | 6 ++++++ lisp/progmodes/compile.el | 2 +- test/automated/compile-tests.el | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 78f0e386327..f3c2426620e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2012-05-21 Stefan Monnier + + * 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 * Makefile.in (setwins, setwins_almost, setwins_for_subdirs): diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index fe1b63f3048..45986591499 100644 --- 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 ad36c4296b4..ecd0e8856f7 100644 --- 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") -- 2.11.4.GIT