summaryrefslogtreecommitdiff
path: root/lisp/progmodes/compile.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2013-01-13 17:08:13 -0800
committerGlenn Morris <rgm@gnu.org>2013-01-13 17:08:13 -0800
commit51e7349210ae8de4296e4efe4ac903ceae8786cc (patch)
tree33ed3d7278e46552d0d3735bd42fa248a1964535 /lisp/progmodes/compile.el
parentb35b088608a02d43b39bbfd3240547d3d9de7366 (diff)
downloademacs-51e7349210ae8de4296e4efe4ac903ceae8786cc.tar.gz
emacs-51e7349210ae8de4296e4efe4ac903ceae8786cc.tar.bz2
emacs-51e7349210ae8de4296e4efe4ac903ceae8786cc.zip
Fix interpretation of gnu line.col1-col2 error message format
* lisp/progmodes/compile.el (compilation-error-regexp-alist-alist): * test/automated/compile-tests.el (compile-tests--test-regexps-data): Fix interpretation of gnu line.col1-col2 format. Fixes: debbugs:13335
Diffstat (limited to 'lisp/progmodes/compile.el')
-rw-r--r--lisp/progmodes/compile.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 4e1cd4a24e3..fa5a0234a69 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -134,6 +134,7 @@ and a string describing how the process finished.")
;; If you make any changes to `compilation-error-regexp-alist-alist',
;; be sure to run the ERT test in test/automated/compile-tests.el.
+;; emacs -batch -l compile-tests.el -f ert-run-tests-batch-and-exit
(defvar compilation-error-regexp-alist-alist
'((absoft
@@ -261,8 +262,8 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
;; The "in \\|from " exception was added to handle messages from Ruby.
"^\\(?:[[:alpha:]][-[:alnum:].]+: ?\\|[ \t]+\\(?:in \\|from \\)\\)?\
\\([0-9]*[^0-9\n]\\(?:[^\n :]\\| [^-/\n]\\|:[^ \n]\\)*?\\): ?\
-\\([0-9]+\\)\\(?:[.:]\\([0-9]+\\)\\)?\
-\\(?:-\\([0-9]+\\)?\\(?:\\.\\([0-9]+\\)\\)?\\)?:\
+\\([0-9]+\\)\\(?:-\\(?4:[0-9]+\\)\\(?:\\.\\(?5:[0-9]+\\)\\)?\
+\\|[.:]\\(?3:[0-9]+\\)\\(?:-\\(?:\\(?4:[0-9]+\\)\\.\\)?\\(?5:[0-9]+\\)\\)?\\)?:\
\\(?: *\\(\\(?:Future\\|Runtime\\)?[Ww]arning\\|W:\\)\\|\
*\\([Ii]nfo\\(?:\\>\\|rmationa?l?\\)\\|I:\\|instantiated from\\|[Nn]ote\\)\\|\
*[Ee]rror\\|\[0-9]?\\(?:[^0-9\n]\\|$\\)\\|[0-9][0-9][0-9]\\)"