summaryrefslogtreecommitdiff
path: root/src/xterm.c
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1994-08-08 10:13:24 +0000
committerRichard M. Stallman <rms@gnu.org>1994-08-08 10:13:24 +0000
commit9a5196d062e9fdb40484c918d0b539d87aef98b4 (patch)
treeb6f3d5c78f46cbd255fe53c9b93416c8747fea37 /src/xterm.c
parent5aba97f2529e894a6e2ae4ce7cb106eebc04aeed (diff)
downloademacs-9a5196d062e9fdb40484c918d0b539d87aef98b4.tar.gz
(XTread_socket): Don't test X_IO_BUG; make that code unconditional.
(x_noop_count, x_term_init): Likewise.
Diffstat (limited to 'src/xterm.c')
-rw-r--r--src/xterm.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/src/xterm.c b/src/xterm.c
index 09c05dbf297..b7427b445ec 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -345,9 +345,7 @@ static short grey_bits[] = {
static Pixmap GreyPixmap = 0;
#endif /* ! defined (HAVE_X11) */
-#ifdef X_IO_BUG
static int x_noop_count;
-#endif
/* From time to time we get info on an Emacs window, here. */
@@ -4390,11 +4388,10 @@ XTread_socket (sd, bufp, numchars, waitp, expected)
}
}
-#ifdef X_IO_BUG
+ /* On some systems, an X bug causes Emacs to get no more events
+ when the window is destroyed. Detect that. (1994.) */
if (! event_found)
{
- /* On some systems, an X bug causes Emacs to get no more events
- when the window is destroyed. Detect that. (1994.) */
/* Emacs and the X Server eats up CPU time if XNoOp is done every time.
One XNOOP in 100 loops will make Emacs terminate.
B. Bretthauer, 1994 */
@@ -4405,7 +4402,6 @@ XTread_socket (sd, bufp, numchars, waitp, expected)
XNoOp (x_current_display);
}
}
-#endif /* X_IO_BUG */
#if 0 /* This fails for serial-line connections to the X server,
because the characters arrive one by one, and a partial
@@ -6219,9 +6215,7 @@ x_term_init (display_name, xrm_option, resource_name)
#endif /* ! defined (F_SETOWN) */
#endif /* F_SETOWN_BUG */
-#ifdef X_IO_BUG
x_noop_count = 0;
-#endif
x_focus_frame = x_highlight_frame = 0;