Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 675-697)

   - Update from CVS
   - Merge from gnus--rel--5.10
   - Release ERC 5.2.

 * gnus--rel--5.10  (patch 211-215)

   - Update from CVS
   - Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-189

3 files changed, 12 insertions, 5 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 3d5383fdc28..c5ad2555bbe 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,7 @@
+2007-03-31  Eli Zaretskii  <eliz@gnu.org>
+
+        * INSTALL: Mention the VCVARS32.BAT batch file for VS.NET users.
+
 2007-03-09  Richard Stallman  <rms@gnu.org>
 
         * INSTALL: Say explicitly this is not for Cygwin.
diff --git a/nt/INSTALL b/nt/INSTALL
index dc88bfd9975..fe5381a6f21 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -123,7 +123,10 @@
   The rest of this file assumes you have a working development
   environment.  If you just installed  such an environment, try
   building a trivial C "Hello world" program, and see if it works.  If
-  it doesn't work, resolve that problem first!
+  it doesn't work, resolve that problem first!  If you use Microsoft
+  Visual Studio .NET 2003, don't forget to run the VCVARS32.BAT batch
+  file from the `Bin' subdirectory of the directory where you have
+  installed VS.NET.
 
   If you use the MinGW port of GCC and GNU Make to build Emacs, there
   are some compatibility issues wrt Make and the shell that is run by
diff --git a/nt/emacs.rc b/nt/emacs.rc
index 2ec3023310a..892d23df019 100644
--- a/nt/emacs.rc
+++ b/nt/emacs.rc
@@ -6,8 +6,8 @@ Emacs ICON   icons\emacs.ico
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 22,0,96,0
- PRODUCTVERSION 22,0,96,0
+ FILEVERSION 22,0,97,0
+ PRODUCTVERSION 22,0,97,0
  FILEFLAGSMASK 0x3FL
 #ifdef EMACSDEBUG
  FILEFLAGS 0x1L
@@ -24,12 +24,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Free Software Foundation\0"
             VALUE "FileDescription", "GNU Emacs for Windows NT/95/98/2000/ME/XP\0"
-            VALUE "FileVersion", "22, 0, 96, 0\0"
+            VALUE "FileVersion", "22, 0, 97, 0\0"
             VALUE "InternalName", "Emacs\0"
             VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007\0"
             VALUE "OriginalFilename", "emacs.exe"
             VALUE "ProductName", "Emacs: The extensible self-documenting text editor\0"
-            VALUE "ProductVersion", "22, 0, 96, 0\0"
+            VALUE "ProductVersion", "22, 0, 97, 0\0"
             VALUE "OLESelfRegister", "\0"
          END
      END