From 6e1a95973d795cccda66c1fae770a3fe1bf8a3c8 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Tue, 5 Sep 2006 14:53:24 +0000 Subject: [PATCH] * progmodes/compile.el (compilation-error-regexp-alist-alist): Process the `gcc-include' after the `gnu' rule. --- lisp/ChangeLog | 5 +++++ lisp/progmodes/compile.el | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 86c2c2c6e90..7632c7dccb3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2006-09-05 Chong Yidong + + * progmodes/compile.el (compilation-error-regexp-alist-alist): + Process the `gcc-include' after the `gnu' rule. + 2006-09-05 Kim F. Storm * ido.el (ido-visit-buffer): Use buffer name if buffer arg is a buffer. diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index e8c09113d39..1c59409566a 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -218,10 +218,6 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1)) 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 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1)) \[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)) -- 2.39.2