aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2012-09-17 10:56:20 +0300
committerEli Zaretskii2012-09-17 10:56:20 +0300
commitb4c932a221c656c23b3c81518c3b5bc3223a7e48 (patch)
tree8dca4b4dbfd5e3cbad7d6ff96ada231cc82df58c /src
parent45ba16c706cf9f009997550f5a3de6ea96643a92 (diff)
downloademacs-b4c932a221c656c23b3c81518c3b5bc3223a7e48.tar.gz
emacs-b4c932a221c656c23b3c81518c3b5bc3223a7e48.zip
Set pending_signals to 1 in w32term.c's read-socket hook.
src/w32term.c (w32_read_socket): Set pending_signals to 1, like xterm.c does. Reported by Daniel Colascione <dancol@dancol.org>.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog3
-rw-r--r--src/w32term.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 68c30dbe19e..36df05c25ae 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
12012-09-17 Eli Zaretskii <eliz@gnu.org> 12012-09-17 Eli Zaretskii <eliz@gnu.org>
2 2
3 * w32term.c (w32_read_socket): Set pending_signals to 1, like
4 xterm.c does. Reported by Daniel Colascione <dancol@dancol.org>.
5
3 * ralloc.c (r_alloc_init) [!SYSTEM_MALLOC]: Initialize 6 * ralloc.c (r_alloc_init) [!SYSTEM_MALLOC]: Initialize
4 __malloc_extra_blocks to 32 instead of 64, like alloc.c did in 7 __malloc_extra_blocks to 32 instead of 64, like alloc.c did in
5 emacs_blocked_malloc, now deleted. 8 emacs_blocked_malloc, now deleted.
diff --git a/src/w32term.c b/src/w32term.c
index 69a16e1852b..6244728b264 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -4162,6 +4162,7 @@ w32_read_socket (struct terminal *terminal, int expected,
4162 if (interrupt_input_blocked) 4162 if (interrupt_input_blocked)
4163 { 4163 {
4164 interrupt_input_pending = 1; 4164 interrupt_input_pending = 1;
4165 pending_signals = 1;
4165 return -1; 4166 return -1;
4166 } 4167 }
4167 4168