*** empty log message ***

2 files changed, 9 insertions, 4 deletions

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 49f84b03166..986927ddda6 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -41,12 +41,13 @@ to the hack introduced on 2005-07-01 to fix some other Cleartype problem.
 ** henman@it.to-be.co.jp 09 Aug 2006: ispell.el problem on Cygwin.
   (Did we decide that is unreproducible?)
 
+** make-network-process :nowait t doesn't work for non-local targets
+   on Windows.  This has been "fixed" for Emacs 22 by defining
+   BROKEN_NON_BLOCKING_CONNECT in ms-w32.h.
+
+
 * BUGS
 
-** make-network-process :nowait t doesn't work for non-local targets
-   on Windows.
-   If it cannot be fixed, (featurep 'make-network-process '(:nowait t))
-   should return nil.
 
 ** monnier@iro.umontreal.ca, Nov 24:
   gnus-summary-tick-article-forward doesn't work any more?
diff --git a/src/ChangeLog b/src/ChangeLog
index 95e2ee842a0..3d84ce0ae88 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-20  Kim F. Storm  <storm@cua.dk>
+
+        * s/ms-w32.h (BROKEN_NON_BLOCKING_CONNECT): Define it.
+
 2006-12-19  Juanma Barranquero  <lekktu@gmail.com>
 
         * keyboard.c (syms_of_keyboard) <double-click-time>: