Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 653-661)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 203-206)

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

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

3 files changed, 27 insertions, 14 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 91696f44b0e..5df79a70fc1 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-03  Eli Zaretskii  <eliz@gnu.org>
+
+        * INSTALL: Add URL of another site with detailed build
+        instructions.
+
 2007-02-16  Glenn Morris  <rgm@gnu.org>
 
         * icons/gnu2a32.ico, icons/gnu2a32t.ico, icons/gnu2b48.ico:
diff --git a/nt/INSTALL b/nt/INSTALL
index b0a1d923520..cc677c3486d 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -26,7 +26,8 @@
        command.com /c configure.bat
 
   3. Run the Make utility suitable for your environment.  If you build
-     with the Microsoft's Visual C compiler:
+     with the Microsoft's Visual C compiler (but see notes about using
+     VC++ 8.0 and later below):
 
        nmake
 
@@ -99,15 +100,17 @@
 
 * Supported development environments
 
-  To compile Emacs, you will need either Microsoft Visual C++ 2.0 or
-  later and nmake, or a Windows port of GCC 2.95 or later with MinGW
-  and W32 API support and a port of GNU Make.  You can use the Cygwin
-  ports of GCC, but Emacs requires the MinGW headers and libraries to
-  build (latest versions of the Cygwin toolkit, at least since v1.3.3,
-  include the MinGW headers and libraries as an integral part).
+  To compile Emacs, you will need either Microsoft Visual C++ 2.0, or
+  later up to 7.0, and nmake, or a Windows port of GCC 2.95 or later
+  with MinGW and W32 API support and a port of GNU Make.  You can use
+  the Cygwin ports of GCC, but Emacs requires the MinGW headers and
+  libraries to build (latest versions of the Cygwin toolkit, at least
+  since v1.3.3, include the MinGW headers and libraries as an integral
+  part).
 
-  Note that building Emacs with Visual Studio 2005 is not supported at
-  this time.
+  Note that building Emacs with Visual Studio 2005 (VC++ 8.0) is not
+  supported at this time, due to changes introduced by Microsoft into
+  the libraries shipped with the compiler.
 
   The rest of this file assumes you have a working development
   environment.  If you just installed  such an environment, try
@@ -191,9 +194,14 @@
 
     http://www.emacswiki.org/cgi-bin/wiki/WThirtyTwoInstallationKit
 
-  and at this URL:
+  and on these URLs:
 
     http://ourcomments.org/Emacs/w32-build-emacs.html
+    http://derekslager.com/blog/posts/2007/01/emacs-hack-3-compile-emacs-from-cvs-on-windows.ashx
+
+  The second URL above includes instructions for building with MSVC,
+  as well as with MinGW, while the first URL covers only MinGW, but
+  has more details about it.
 
 * Configuring
 
diff --git a/nt/emacs.rc b/nt/emacs.rc
index 85e74c7a9d6..60ad01bd0aa 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,94,0
- PRODUCTVERSION 22,0,94,0
+ FILEVERSION 22,0,95,0
+ PRODUCTVERSION 22,0,95,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, 94, 0\0"
+            VALUE "FileVersion", "22, 0, 95, 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, 94, 0\0"
+            VALUE "ProductVersion", "22, 0, 95, 0\0"
             VALUE "OLESelfRegister", "\0"
          END
      END