Fixes: debbugs:7806

* etc/compilation.txt: Add column to gcc-include sample.

* lisp/progmodes/compile.el (compilation-error-regexp-alist-alist)
[gcc-include]: Tighten file name match, add match for column
number.

4 files changed, 15 insertions, 3 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 22c674275c8..9d8a3b8aafd 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-08  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * compilation.txt: Add column to gcc-include sample.
+
 2011-01-08  Glenn Morris  <rgm@gnu.org>
 
         * PROBLEMS: -batch implies -q.
@@ -5158,7 +5162,7 @@
 ;; End:
 
   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
-    2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+    2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
     Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.
diff --git a/etc/compilation.txt b/etc/compilation.txt
index 9cf39c90f9f..9ee2e16366b 100644
--- a/etc/compilation.txt
+++ b/etc/compilation.txt
@@ -233,7 +233,7 @@ symbol: gcc-include
 The last file, i.e. the one you are compiling, is the interesting one.
 
 In file included from /usr/include/c++/3.3/backward/warn.h:4,
-                 from /usr/include/c++/3.3/backward/iostream.h:31,
+                 from /usr/include/c++/3.3/backward/iostream.h:31:0,
                  from test_clt.cc:1:
 
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d57a8a3532a..fce4875e965 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-01-08  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * progmodes/compile.el (compilation-error-regexp-alist-alist)
+        [gcc-include]: Tighten file name match, add match for column
+        number.  (Bug#7806)
+
 2011-01-08  Glenn Morris  <rgm@gnu.org>
 
         * makefile.w32-in (EMACSOPT): Add --no-site-lisp.
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index da9b213ad8f..eabfe22b5ee 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -239,7 +239,9 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
 
     (gcc-include
      "^\\(?:In file included \\|                 \\|\t\\)from \
-\\(.+\\):\\([0-9]+\\)\\(?:\\(:\\)\\|\\(,\\|$\\)\\)?" 1 2 nil (3 . 4))
+\\([0-9]*[^0-9\n]\\(?:[^\n :]\\| [^-/\n]\\|:[^ \n]\\)*?\\):\
+\\([0-9]+\\)\\(?::\\([0-9]+\\)\\)?\\(?:\\(:\\)\\|\\(,\\|$\\)\\)?"
+     1 2 3 (4 . 5))
 
     (gnu
      ;; The first line matches the program name for