Mercurial > emacs
changeset 72658:6cf723aafba1
* progmodes/compile.el (compilation-error-regexp-alist-alist):
Process the `gcc-include' after the `gnu' rule.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Tue, 05 Sep 2006 14:53:24 +0000 |
| parents | 85d9ff9eee3f |
| children | 7817efe2e430 |
| files | lisp/ChangeLog lisp/progmodes/compile.el |
| diffstat | 2 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Sep 05 14:18:46 2006 +0000 +++ b/lisp/ChangeLog Tue Sep 05 14:53:24 2006 +0000 @@ -1,3 +1,8 @@ +2006-09-05 Chong Yidong <cyd@stupidchicken.com> + + * progmodes/compile.el (compilation-error-regexp-alist-alist): + Process the `gcc-include' after the `gnu' rule. + 2006-09-05 Kim F. Storm <storm@cua.dk> * ido.el (ido-visit-buffer): Use buffer name if buffer arg is a buffer.
--- a/lisp/progmodes/compile.el Tue Sep 05 14:18:46 2006 +0000 +++ b/lisp/progmodes/compile.el Tue Sep 05 14:53:24 2006 +0000 @@ -218,10 +218,6 @@ nil 1 nil 2 0 (2 (compilation-face '(3)))) - (gcc-include - "^\\(?:In file included\\| \\) from \ -\\(.+\\):\\([0-9]+\\)\\(?:\\(:\\)\\|\\(,\\)\\)?" 1 2 nil (3 . 4)) - (gnu ;; I have no idea what this first line is supposed to match, but it ;; makes things ambiguous with output such as "foo:344:50:blabla" since @@ -241,6 +237,12 @@ \[0-9]?\\(?:[^0-9\n]\\|$\\)\\|[0-9][0-9][0-9]\\)" 1 (2 . 5) (4 . 6) (7 . 8)) + ;; The `gnu' style above can incorrectly match gcc's "In file + ;; included from" message, so we process that first. -- cyd + (gcc-include + "^\\(?:In file included\\| \\) from \ +\\(.+\\):\\([0-9]+\\)\\(?:\\(:\\)\\|\\(,\\)\\)?" 1 2 nil (3 . 4)) + (lcc "^\\(?:E\\|\\(W\\)\\), \\([^(\n]+\\)(\\([0-9]+\\),[ \t]*\\([0-9]+\\)" 2 3 4 (1))