From 819a6054c72afc94ff1bbcfb1225e9db6696f032 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Mon, 27 Jun 2011 00:23:27 -0700 Subject: [PATCH] flymake.el fix for bug#8866. * lisp/progmodes/flymake.el (flymake-err-line-patterns): Allow for column numbers in the ant/javac pattern. --- lisp/ChangeLog | 21 +++++++++------------ lisp/progmodes/flymake.el | 4 ++-- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f32ea602729..499a30d2031 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,29 +1,28 @@ +2011-06-27 Glenn Morris + + * progmodes/flymake.el (flymake-err-line-patterns): + Allow for column numbers in the ant/javac pattern. (Bug#8866) + 2011-06-27 Vincent Belaïche - * ses.el (ses-relocate-range): Keep rest of arguments for - ses-range. + * ses.el (ses-relocate-range): Keep rest of arguments for ses-range. (ses--clean-!, ses--clean-_): New functions. (ses-range): Add configurability of readout order, and conversion to Calc vector. -2011-06-27 Vincent Belaïche - * ses.el (ses-repair-cell-reference-all): New function. (ses-cell-symbol): Set macro as safe, so that it can be used in formulas. -2011-06-27 Vincent Belaïche - * ses.el: Update cycle detection algorithm. (ses-localvars): Add ses--Dijkstra-attempt-nb and - ses--Dijkstra-weight-bound, and initial values thereof when - applicable. + ses--Dijkstra-weight-bound, and initial values thereof when applicable. (ses-set-localvars): New function. (ses-make-cell): Add property-list as a cell element. (ses-cell-property-get-fun, ses-cell-property-get) (ses-cell-property-delq-fun, ses-cell-property-set-fun) - (ses-cell-property-pop-fun, ses-cell-property-get-handle-fun): New - functions. + (ses-cell-property-pop-fun, ses-cell-property-get-handle-fun): + New functions. (ses-cell-property-set, ses-cell-property-pop) (ses-cell-property-get-handle): New macro. (ses-cell-property-handle-car, ses-cell-property-handle-setcar): @@ -39,8 +38,6 @@ (ses-recalculate-cell): Update for cycle detection based on Dijkstra algorithm. -2011-06-27 Vincent Belaïche - * ses.el: Fix commenting and indenting convention. 2011-06-27 Stefan Monnier diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el index c01086c970e..8f617b44dae 100644 --- a/lisp/progmodes/flymake.el +++ b/lisp/progmodes/flymake.el @@ -924,8 +924,8 @@ Convert it to flymake internal format." ;; PHP ("\\(?:Parse\\|Fatal\\) error: \\(.*\\) in \\(.*\\) on line \\([0-9]+\\)" 2 3 nil 1) ;; LaTeX warnings (fileless) ("\\(LaTeX \\(Warning\\|Error\\): .*\\) on input line \\([0-9]+\\)" 20 3 nil 1) - ;; ant/javac - (" *\\(\\[javac\\] *\\)?\\(\\([a-zA-Z]:\\)?[^:(\t\n]+\\)\:\\([0-9]+\\)\:[ \t\n]*\\(.+\\)" + ;; ant/javac. Note this also matches gcc warnings! + (" *\\(\\[javac\\] *\\)?\\(\\([a-zA-Z]:\\)?[^:(\t\n]+\\)\:\\([0-9]+\\)\\(?:\:[0-9]+\\)?\:[ \t\n]*\\(.+\\)" 2 4 nil 5)) ;; compilation-error-regexp-alist) (flymake-reformat-err-line-patterns-from-compile-el compilation-error-regexp-alist-alist)) -- 2.39.2