Commit 7c837933 authored by Andreas Schwab's avatar Andreas Schwab
Browse files

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.
parent e7a42417
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> 2011-01-08 Glenn Morris <rgm@gnu.org>
* PROBLEMS: -batch implies -q. * PROBLEMS: -batch implies -q.
...@@ -5158,7 +5162,7 @@ ...@@ -5158,7 +5162,7 @@
;; End: ;; End:
Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 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. Free Software Foundation, Inc.
This file is part of GNU Emacs. This file is part of GNU Emacs.
......
...@@ -233,7 +233,7 @@ symbol: gcc-include ...@@ -233,7 +233,7 @@ symbol: gcc-include
The last file, i.e. the one you are compiling, is the interesting one. 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, 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: from test_clt.cc:1:
......
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> 2011-01-08 Glenn Morris <rgm@gnu.org>
   
* makefile.w32-in (EMACSOPT): Add --no-site-lisp. * makefile.w32-in (EMACSOPT): Add --no-site-lisp.
......
...@@ -239,7 +239,9 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1)) ...@@ -239,7 +239,9 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
(gcc-include (gcc-include
"^\\(?:In file included \\| \\|\t\\)from \ "^\\(?: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 (gnu
;; The first line matches the program name for ;; The first line matches the program name for
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment