[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el,v
From: |
Chong Yidong |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el,v |
Date: |
Tue, 05 Sep 2006 14:53:25 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Chong Yidong <cyd> 06/09/05 14:53:24
Index: progmodes/compile.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/progmodes/compile.el,v
retrieving revision 1.404
retrieving revision 1.405
diff -u -b -r1.404 -r1.405
--- progmodes/compile.el 19 Jul 2006 19:20:11 -0000 1.404
+++ progmodes/compile.el 5 Sep 2006 14:53:24 -0000 1.405
@@ -218,10 +218,6 @@
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 @@
\[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))
- [Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el,v,
Chong Yidong <=
- [Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el,v, Nick Roberts, 2006/09/12
- [Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el,v, Paul Eggert, 2006/09/12
- [Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el,v, Chong Yidong, 2006/09/15
- [Emacs-diffs] Changes to emacs/lisp/progmodes/compile.el,v, Richard M. Stallman, 2006/09/24