summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChong Yidong <cyd@stupidchicken.com>2010-02-20 08:53:06 -0500
committerChong Yidong <cyd@stupidchicken.com>2010-02-20 08:53:06 -0500
commit3e39928c770cb6a4726cb9b81e10b04b9e685748 (patch)
tree0d898baf5ea106013e3d28873a0fb3b541ccf7a1
parent0f00e9485d96c308b126553bd1b90ce4e64f1a1d (diff)
downloademacs-3e39928c770cb6a4726cb9b81e10b04b9e685748.tar.gz
* progmodes/compile.el (compilation-error-regexp-alist-alist): In
`watcom' anchor regexp to start of line, to avoid slowness (Bug#5599).
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/progmodes/compile.el2
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5613793edff..7dcf2300454 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2010-02-20 Kevin Ryde <user42@zip.com.au>
+
+ * progmodes/compile.el (compilation-error-regexp-alist-alist): In
+ `watcom' anchor regexp to start of line, to avoid slowness
+ (Bug#5599).
+
2010-02-20 Eli Zaretskii <eliz@gnu.org>
* subr.el (remove-yank-excluded-properties): Explain in a comment
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index 132b9dbe8f0..7e013b87c19 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -350,7 +350,7 @@ File = \\(.+\\), Line = \\([0-9]+\\)\\(?:, Column = \\([0-9]+\\)\\)?"
"^\\([^, \n\t]+\\), line \\([0-9]+\\), char \\([0-9]+\\)[:., \(-]" 1 2 3)
(watcom
- "\\(\\(?:[a-zA-Z]:\\)?[^:(\t\n]+\\)(\\([0-9]+\\)): ?\
+ "^[ \t]*\\(\\(?:[a-zA-Z]:\\)?[^:(\t\n]+\\)(\\([0-9]+\\)): ?\
\\(?:\\(Error! E[0-9]+\\)\\|\\(Warning! W[0-9]+\\)\\):"
1 2 nil (4))