Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 662-669)

   - Update from CVS
   - Fix read-only prompt problem in isearch
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 207-208)

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

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

2 files changed, 21 insertions, 11 deletions

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 5df79a70fc1..3d5383fdc28 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,7 +1,10 @@
+2007-03-09  Richard Stallman  <rms@gnu.org>
+
+        * INSTALL: Say explicitly this is not for Cygwin.
+
 2007-03-03  Eli Zaretskii  <eliz@gnu.org>
 
-        * INSTALL: Add URL of another site with detailed build
-        instructions.
+        * INSTALL: Add URL of another site with detailed build instructions.
 
 2007-02-16  Glenn Morris  <rgm@gnu.org>
 
@@ -9,8 +12,8 @@
         * icons/gnu2b48t.ico, icons/gnu3b32.ico, icons/gnu3b32t.ico:
         * icons/gnu4g48.ico, icons/gnu4g48t.ico, icons/gnu5w32.ico:
         * icons/gnu5w32t.ico, icons/gnu6w48.ico, icons/gnu6w48t.ico:
-        * icons/gnu7.ico, icons/gnu8.ico, icons/gnu9.ico: Restore all but
-        two of icons deleted in previous change.
+        * icons/gnu7.ico, icons/gnu8.ico, icons/gnu9.ico:
+        Restore all but two of icons deleted in previous change.
 
 2007-02-13  Chong Yidong  <cyd@stupidchicken.com>
 
@@ -21,8 +24,8 @@
         * icons/gnu4g48.ico, icons/gnu6w48.ico, icons/gnu9.ico:
         * icons/gnu2b48t.ico, icons/gnu4g48t.ico:
         * icons/gnu6w48t.ico, icons/gnu2a32.ico, icons/gnu3b32.ico:
-        * icons/gnu5w32.ico, icons/gnu7.ico, icons/sink.ico: Unused icons
-        deleted.
+        * icons/gnu5w32.ico, icons/gnu7.ico, icons/sink.ico:
+        Unused icons deleted.
 
 2007-01-31  Juanma Barranquero  <lekktu@gmail.com>
 
@@ -40,7 +43,7 @@
 
         * nmake.defs (TEMACS_EXTRA_LINK): Remove duplicated flags from
         DEBUG_LINK.
-        (DEBUG_LINK): Remove -debugtype:both
+        (DEBUG_LINK): Remove -debugtype:both.
 
 2006-12-27  Eli Zaretskii  <eliz@gnu.org>
 
@@ -812,8 +815,7 @@
 
         * install.bat: Pass on command line arguments to make.
 
-        * makefile.nt (fast_install): Bring commands up-to-date, and fix
-        typo.
+        * makefile.nt (fast_install): Bring commands up-to-date, and fix typo.
 
 1999-11-21  Andrew Innes  <andrewi@gnu.org>
 
diff --git a/nt/INSTALL b/nt/INSTALL
index cc677c3486d..dc88bfd9975 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -8,8 +8,11 @@
 * For the impatient
 
   Here are the concise instructions for configuring and building the
-  native Win32 binary of Emacs on Windows, for those who want to skip
-  the complex explanations and ``just do it'':
+  native Windows binary of Emacs, for those who want to skip the
+  complex explanations and ``just do it'':
+
+  Do not use this recipe with Cygwin.  For building on Cygwin,
+  use the normal installation instructions, ../INSTALL.
 
   1. Change to the `nt' directory (the directory of this file):
 
@@ -75,6 +78,11 @@
 
 * Preliminaries
 
+  If you want to build a Cygwin port of Emacs, use the instructions in
+  the INSTALL file in the main Emacs directory (the parent of this
+  directory).  These instructions are for building a native Windows
+  binary of Emacs.
+
   If you used WinZip to unpack the distribution, we suggest to
   remove the files and unpack again with a different program!
   WinZip is known to create some subtle and hard to debug problems,