* w32inevt.c (w32_console_read_socket): Return -1 on failure, not 0.

Ignore 'expected'. See Eli Zaretskii in
<http://bugs.gnu.org/12471#8> (last line).

diff --git a/src/ChangeLog b/src/ChangeLog
index 42e7f6e87a3e7dd6a8c7ab8e2e164b427d42887b..e8827c2de189350ab91dc1f36ee5603463970ac0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2012-09-19  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * w32inevt.c (w32_console_read_socket): Return -1 on failure, not 0.
+       Ignore 'expected'. See Eli Zaretskii in
+       <http://bugs.gnu.org/12471#8> (last line).
+
        * frame.c (read_integer): Remove.  All uses replaced by strtol/strtoul.
        (XParseGeometry): Now static.  Substitute extremal values for
        values that are out of range.

diff --git a/src/w32inevt.c b/src/w32inevt.c
index ee07db5335b4354d1bed2f08b4da51adcdb2c071..d4cc620335cf58a5b1d8b04f0f042b07494587fe 100644 (file)
--- a/src/w32inevt.c
+++ b/src/w32inevt.c
@@ -747,7 +747,7 @@ w32_console_read_socket (struct terminal *terminal,
                          int expected,
                          struct input_event *hold_quit)
 {
-  int nev, ret = 0, add;
+  int nev, add;
   int isdead;
 
   if (interrupt_input_blocked)
@@ -767,8 +767,7 @@ w32_console_read_socket (struct terminal *terminal,
          /* If nev == -1, there was some kind of error
             If nev == 0 then waitp must be zero and no events were available
             so return.  */
-         UNBLOCK_INPUT;
-         return nev;
+         break;
         }
 
       while (nev > 0)
@@ -812,9 +811,6 @@ w32_console_read_socket (struct terminal *terminal,
          queue_ptr++;
          nev--;
         }
-
-      if (ret > 0 || expected == 0)
-       break;
     }
 
   /* We don't get told about changes in the window size (only the buffer
@@ -824,5 +820,5 @@ w32_console_read_socket (struct terminal *terminal,
     maybe_generate_resize_event ();
 
   UNBLOCK_INPUT;
-  return ret;
+  return nev;
 }