merge trunk

3 files changed, 15 insertions, 3 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 27237ca0f61..4e1f15e913d 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -2,6 +2,11 @@
 
         * charsets/JISC6226.map: Re-generated.
 
+2012-10-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * compilation.txt (msft): Add error messages in new Studio 2010
+        format.
+
 2012-10-11  Kenichi Handa  <handa@gnu.org>
 
         * charsets/CNS-2.map, charsets/CNS-3.map, charsets/CNS-4.map,
diff --git a/etc/NEWS b/etc/NEWS
index 2b934741c2c..5a310d8f82c 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -137,16 +137,16 @@ It is no longer necessary to call `imagemagick-register-types'
 explicitly to install ImageMagick image types; that function is called
 automatically at startup, or when customizing a relevant imagemagick-
 option.
-
++++
 *** Setting `imagemagick-types-inhibit' to t now disables the use of
 ImageMagick to view images.  You must call imagemagick-register-types
 afterwards if you do not use customize to change this.
-
++++
 *** The new variable `imagemagick-enabled-types' also affects which
 ImageMagick types are treated as images.  The function
 `imagemagick-filter-types' returns the list of types that will be
 treated as images.
-
+---
 *** Images displayed via ImageMagick now support transparency and the
 :background image spec property.
 
diff --git a/etc/compilation.txt b/etc/compilation.txt
index 269f8d23e6b..8d31847569c 100644
--- a/etc/compilation.txt
+++ b/etc/compilation.txt
@@ -308,6 +308,13 @@ 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'
+1>test_main.cpp(29): error C2144: syntax error : 'int' should be preceded by ';'
+1>test_main.cpp(29): error C4430: missing type specifier - int assumed. Note: C++ does not support default-int
+1>
+1>Build FAILED.
+1>
+1>Time Elapsed 00:00:01.46
+========== Build: 0 succeeded, 1 failed, 0 up-to-date, 0 skipped ==========
 
 
 * Open Watcom