summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--etc/ChangeLog4
-rw-r--r--etc/compilation.txt1
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/progmodes/compile.el8
4 files changed, 15 insertions, 3 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog
index f109df9fbfc..763c9dc78f7 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-08 Chong Yidong <cyd@stupidchicken.com>
+
+ * compilation.txt: Add one more error message for msft (Bug#4100).
+
2009-10-09 Karl Fogel <karl.fogel@red-bean.com>
* NEWS: Document bookmark.el at 2008-06-25T16:51:33Z!monnier@iro.umontreal.ca format upgrade. (Bug#3375)
diff --git a/etc/compilation.txt b/etc/compilation.txt
index 27c98de51e0..6ee90ae4bb5 100644
--- a/etc/compilation.txt
+++ b/etc/compilation.txt
@@ -269,6 +269,7 @@ made it more strict about the error message that follows.
keyboard handler.c(537) : warning C4005: 'min' : macro redefinition
d:\tmp\test.c(23) : error C2143: syntax error : missing ';' before 'if'
+d:\tmp\test.c(1145) : see declaration of 'nsRefPtr'
* Open Watcom
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aa45dbc1c68..d353fdf7832 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-08 Jared Finder <jfinder@crypticstudios.com>
+
+ * progmodes/compile.el (compilation-error-regexp-alist-alist):
+ Handle "see declaration of" MSFT statements (Bug#4100).
+
2009-11-08 Michael Albinus <michael.albinus@gmx.de>
* net/tramp.el (tramp-advice-make-auto-save-file-name)
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index b12e18a1eaf..91bfcf01bee 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -297,9 +297,11 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
" in \\([^()\n ]+\\)(\\([0-9]+\\))$" 1 2)
(msft
- ;; AFAWK, The message may be a "warning", "error", or "fatal error".
- "^\\([0-9]+>\\)?\\(\\(?:[a-zA-Z]:\\)?[^:(\t\n]+\\)(\\([0-9]+\\)) \
-: \\(?:warnin\\(g\\)\\|[a-z ]+\\) C[0-9]+:" 2 3 nil (4))
+ ;; The message may be a "warning", "error", or "fatal error" with
+ ;; an error code, or "see declaration of" without an error code.
+ "^ *\\([0-9]+>\\)?\\(\\(?:[a-zA-Z]:\\)?[^:(\t\n]+\\)(\\([0-9]+\\)) \
+: \\(?:see declaration\\|\\(?:warnin\\(g\\)\\|[a-z ]+\\) C[0-9]+:\\)"
+ 2 3 nil (4))
(omake
;; "omake -P" reports "file foo changed"