Commit a4fc7360 authored by Jim Blandy's avatar Jim Blandy

* xterm.c (x_term_init): If the X connection is already in file

	descriptor zero, don't dup it and close the old one.
parent 055e9517
......@@ -4557,17 +4557,20 @@ x_term_init (display_name)
x_watch_cut_buffer_cache ();
#endif
dup2 (ConnectionNumber (x_current_display), 0);
if (ConnectionNumber (x_current_display) != 0)
{
dup2 (ConnectionNumber (x_current_display), 0);
#ifndef SYSV_STREAMS
/* Streams somehow keeps track of which descriptor number
is being used to talk to X. So it is not safe to substitute
descriptor 0. But it is safe to make descriptor 0 a copy of it. */
close (ConnectionNumber (x_current_display));
ConnectionNumber (x_current_display) = 0; /* Looks a little strange?
/* Streams somehow keeps track of which descriptor number
is being used to talk to X. So it is not safe to substitute
descriptor 0. But it is safe to make descriptor 0 a copy of it. */
close (ConnectionNumber (x_current_display));
ConnectionNumber (x_current_display) = 0; /* Looks a little strange?
* check the def of the macro;
* it is a genuine lvalue */
#endif /* SYSV_STREAMS */
}
#endif /* ! defined (HAVE_X11) */
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment