aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2009-11-08 16:30:52 +0000
committerChong Yidong2009-11-08 16:30:52 +0000
commit951802d0c19bb13d5d93e914f6b18c4548336261 (patch)
tree0cea1436ccf37d944b71e60ba7b55e78727f6506
parentb25399ac468e5fffbaba27766baa27030f1f6118 (diff)
downloademacs-951802d0c19bb13d5d93e914f6b18c4548336261.tar.gz
emacs-951802d0c19bb13d5d93e914f6b18c4548336261.zip
* compilation.txt: Add one more error message for msft (Bug#4100).
-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 @@
12009-11-08 Chong Yidong <cyd@stupidchicken.com>
2
3 * compilation.txt: Add one more error message for msft (Bug#4100).
4
12009-10-09 Karl Fogel <karl.fogel@red-bean.com> 52009-10-09 Karl Fogel <karl.fogel@red-bean.com>
2 6
3 * NEWS: Document bookmark.el at 2008-06-25T16:51:33Z!monnier@iro.umontreal.ca format upgrade. (Bug#3375) 7 * 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.
269 269
270keyboard handler.c(537) : warning C4005: 'min' : macro redefinition 270keyboard handler.c(537) : warning C4005: 'min' : macro redefinition
271d:\tmp\test.c(23) : error C2143: syntax error : missing ';' before 'if' 271d:\tmp\test.c(23) : error C2143: syntax error : missing ';' before 'if'
272d:\tmp\test.c(1145) : see declaration of 'nsRefPtr'
272 273
273 274
274* Open Watcom 275* Open Watcom
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aa45dbc1c68..d353fdf7832 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12009-11-08 Jared Finder <jfinder@crypticstudios.com>
2
3 * progmodes/compile.el (compilation-error-regexp-alist-alist):
4 Handle "see declaration of" MSFT statements (Bug#4100).
5
12009-11-08 Michael Albinus <michael.albinus@gmx.de> 62009-11-08 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * net/tramp.el (tramp-advice-make-auto-save-file-name) 8 * 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))
297 " in \\([^()\n ]+\\)(\\([0-9]+\\))$" 1 2) 297 " in \\([^()\n ]+\\)(\\([0-9]+\\))$" 1 2)
298 298
299 (msft 299 (msft
300 ;; AFAWK, The message may be a "warning", "error", or "fatal error". 300 ;; The message may be a "warning", "error", or "fatal error" with
301 "^\\([0-9]+>\\)?\\(\\(?:[a-zA-Z]:\\)?[^:(\t\n]+\\)(\\([0-9]+\\)) \ 301 ;; an error code, or "see declaration of" without an error code.
302: \\(?:warnin\\(g\\)\\|[a-z ]+\\) C[0-9]+:" 2 3 nil (4)) 302 "^ *\\([0-9]+>\\)?\\(\\(?:[a-zA-Z]:\\)?[^:(\t\n]+\\)(\\([0-9]+\\)) \
303: \\(?:see declaration\\|\\(?:warnin\\(g\\)\\|[a-z ]+\\) C[0-9]+:\\)"
304 2 3 nil (4))
303 305
304 (omake 306 (omake
305 ;; "omake -P" reports "file foo changed" 307 ;; "omake -P" reports "file foo changed"