Mercurial > emacs
changeset 112158:85f869bc6e5c
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.
| author | Andreas Schwab <schwab@linux-m68k.org> |
|---|---|
| date | Sat, 08 Jan 2011 14:31:26 +0100 |
| parents | f07ac5fe9893 |
| children | 038a93c74821 |
| files | etc/ChangeLog etc/compilation.txt lisp/ChangeLog lisp/progmodes/compile.el |
| diffstat | 4 files changed, 15 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/etc/ChangeLog Fri Jan 07 18:53:50 2011 -0800 +++ b/etc/ChangeLog Sat Jan 08 14:31:26 2011 +0100 @@ -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.
--- a/etc/compilation.txt Fri Jan 07 18:53:50 2011 -0800 +++ b/etc/compilation.txt Sat Jan 08 14:31:26 2011 +0100 @@ -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:
--- a/lisp/ChangeLog Fri Jan 07 18:53:50 2011 -0800 +++ b/lisp/ChangeLog Sat Jan 08 14:31:26 2011 +0100 @@ -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.
--- a/lisp/progmodes/compile.el Fri Jan 07 18:53:50 2011 -0800 +++ b/lisp/progmodes/compile.el Sat Jan 08 14:31:26 2011 +0100 @@ -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