[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r110104: * w32inevt.c (w32_console_re
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r110104: * w32inevt.c (w32_console_read_socket): Return -1 on failure, not 0. |
Date: |
Wed, 19 Sep 2012 14:38:00 -0700 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 110104
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Wed 2012-09-19 14:38:00 -0700
message:
* 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).
modified:
src/ChangeLog
src/w32inevt.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-09-19 17:28:13 +0000
+++ b/src/ChangeLog 2012-09-19 21:38:00 +0000
@@ -1,5 +1,9 @@
2012-09-19 Paul Eggert <address@hidden>
+ * 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.
=== modified file 'src/w32inevt.c'
--- a/src/w32inevt.c 2012-09-15 08:03:11 +0000
+++ b/src/w32inevt.c 2012-09-19 21:38:00 +0000
@@ -747,7 +747,7 @@
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 @@
/* 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 @@
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 @@
maybe_generate_resize_event ();
UNBLOCK_INPUT;
- return ret;
+ return nev;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r110104: * w32inevt.c (w32_console_read_socket): Return -1 on failure, not 0.,
Paul Eggert <=