Merged in changes from CVS trunk.

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-383
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-384
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-385
   src/xfaces.c (push_named_merge_point): Return 0 if a cycle is detected

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-386
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-387
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-388
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-389
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-390
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-391
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-392
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-393
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-196

2 files changed, 12 insertions, 7 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 9091da843cf..77c8305b0e5 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,8 @@
+2004-06-07  Juanma Barranquero  <lektu@terra.es>
+
+        * INSTALL: Clarify paragraph about compatibility between image
+        libraries and builds of Emacs with several compilers.
+
 2004-06-06  Juanma Barranquero  <lektu@terra.es>
 
         * makefile.w32-in (bootstrap-nmake): When nmake'ing bootstrap on
diff --git a/nt/INSTALL b/nt/INSTALL
index 420dced5505..646054e07f4 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -112,13 +112,13 @@
 
   Binaries for the image libraries (among many others) can be found at
   GnuWin32 (http://gnuwin32.sourceforge.net).  These are built with
-  MinGW and work better with GCC/MinGW builds of Emacs, like the
-  official binary tarballs for Windows.  Compatibility with MSVC is
-  still weak and should not be trusted in production environments; if
-  you really need an MSVC-compiled Emacs with image support, you should
-  try to build the required libraries with the same compiler (though it
-  can be extremely non-trivial, and we'll be interested on hearing of
-  any such effort).
+  MinGW, and so are very compatible with GCC/MinGW builds of Emacs (like
+  the official binary tarballs for Windows).  Compatibility with MSVC,
+  on the other hand, is still weak and should not be trusted in
+  production environments; if you really need an MSVC-compiled Emacs
+  with image support, you should try to build the required libraries
+  with the same compiler (though it can be extremely non-trivial, and
+  we'll be interested on hearing of any such effort).
 
 * Building