aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Schwab2012-03-24 09:32:50 +0100
committerAndreas Schwab2012-03-24 09:32:50 +0100
commit7d1c3a76cf92f366549b6588191fd7eb71b9abcc (patch)
treeeaa5dd971d1e22007706128aa28ff3940a187830 /src
parente99a9b8bdccadded1f6fae88ee7a2a93dfd4eacf (diff)
downloademacs-7d1c3a76cf92f366549b6588191fd7eb71b9abcc.tar.gz
emacs-7d1c3a76cf92f366549b6588191fd7eb71b9abcc.zip
Fixes: debbugs:11080
* xterm.c (XTread_socket): Only modify handling_signal if !SYNC_INPUT.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xterm.c7
2 files changed, 11 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 028b8325aae..11676be8348 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12012-03-24 Andreas Schwab <schwab@linux-m68k.org>
2
3 * xterm.c (XTread_socket): Only modify handling_signal if
4 !SYNC_INPUT. (Bug#11080)
5
12012-03-23 Eli Zaretskii <eliz@gnu.org> 62012-03-23 Eli Zaretskii <eliz@gnu.org>
2 7
3 * bidi.c (bidi_fetch_char): Use STRING_CHAR_AND_LENGTH instead of 8 * bidi.c (bidi_fetch_char): Use STRING_CHAR_AND_LENGTH instead of
diff --git a/src/xterm.c b/src/xterm.c
index ddc5db23414..9ce166883c3 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7099,7 +7099,8 @@ x_dispatch_event (XEvent *event, Display *display)
7099 7099
7100 7100
7101/* Read events coming from the X server. 7101/* Read events coming from the X server.
7102 This routine is called by the SIGIO handler. 7102 This routine is called by the SIGIO handler only if SYNC_INPUT is
7103 not defined.
7103 We return as soon as there are no more events to be read. 7104 We return as soon as there are no more events to be read.
7104 7105
7105 We return the number of characters stored into the buffer, 7106 We return the number of characters stored into the buffer,
@@ -7133,7 +7134,9 @@ XTread_socket (struct terminal *terminal, int expected, struct input_event *hold
7133 /* So people can tell when we have read the available input. */ 7134 /* So people can tell when we have read the available input. */
7134 input_signal_count++; 7135 input_signal_count++;
7135 7136
7137#ifndef SYNC_INPUT
7136 ++handling_signal; 7138 ++handling_signal;
7139#endif
7137 7140
7138 /* For debugging, this gives a way to fake an I/O error. */ 7141 /* For debugging, this gives a way to fake an I/O error. */
7139 if (terminal->display_info.x == XTread_socket_fake_io_error) 7142 if (terminal->display_info.x == XTread_socket_fake_io_error)
@@ -7223,7 +7226,9 @@ XTread_socket (struct terminal *terminal, int expected, struct input_event *hold
7223 pending_autoraise_frame = 0; 7226 pending_autoraise_frame = 0;
7224 } 7227 }
7225 7228
7229#ifndef SYNC_INPUT
7226 --handling_signal; 7230 --handling_signal;
7231#endif
7227 UNBLOCK_INPUT; 7232 UNBLOCK_INPUT;
7228 7233
7229 return count; 7234 return count;