* etc/NEWS: In terminal-oriented subshells, the EMACS environment

[bpt/emacs.git] / src / w32proc.c

diff --git a/src/w32proc.c b/src/w32proc.c
index 7e34498..d874d18 100644 (file)
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -1,5 +1,6 @@
 /* Process support for GNU Emacs on the Microsoft W32 API.
-   Copyright (C) 1992, 95, 99, 2000, 01, 04  Free Software Foundation, Inc.
+   Copyright (C) 1992, 1995, 1999, 2000, 2001, 2002, 2003, 2004,
+                2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -279,7 +280,10 @@ reader_thread (void *arg)
     {
       int rc;
 
-      rc = _sys_read_ahead (cp->fd);
+      if (fd_info[cp->fd].flags & FILE_LISTEN)
+       rc = _sys_wait_accept (cp->fd);
+      else
+       rc = _sys_read_ahead (cp->fd);
 
       /* The name char_avail is a misnomer - it really just means the
         read-ahead has completed, whether successfully or not. */