[Emacs-diffs] /srv/bzr/emacs/trunk r102787: Fixes: debbugs:7806

[Andreas Schwab]

------------------------------------------------------------
revno: 102787
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Sat 2011-01-08 14:31:26 +0100
message:
  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.
modified:
  etc/ChangeLog
  etc/compilation.txt
  lisp/ChangeLog
  lisp/progmodes/compile.el

=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog     2011-01-08 02:49:27 +0000
+++ b/etc/ChangeLog     2011-01-08 13:31:26 +0000
@@ -1,3 +1,7 @@
+2011-01-08  Andreas Schwab  <address@hidden>
+
+       * compilation.txt: Add column to gcc-include sample.
+
 2011-01-08  Glenn Morris  <address@hidden>
 
        * 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.

=== modified file 'etc/compilation.txt'
--- a/etc/compilation.txt       2010-08-15 00:04:53 +0000
+++ b/etc/compilation.txt       2011-01-08 13:31:26 +0000
@@ -233,7 +233,7 @@
 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:
 
 

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-01-08 02:53:50 +0000
+++ b/lisp/ChangeLog    2011-01-08 13:31:26 +0000
@@ -1,3 +1,9 @@
+2011-01-08  Andreas Schwab  <address@hidden>
+
+       * 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  <address@hidden>
 
        * makefile.w32-in (EMACSOPT): Add --no-site-lisp.

=== modified file 'lisp/progmodes/compile.el'
--- a/lisp/progmodes/compile.el 2010-12-10 20:00:25 +0000
+++ b/lisp/progmodes/compile.el 2011-01-08 13:31:26 +0000
@@ -239,7 +239,9 @@
 
     (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