mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-02-22 12:57:34 +00:00
* xterm.c (x_term_init): If the X connection is already in file
descriptor zero, don't dup it and close the old one.
This commit is contained in:
parent
055e9517dc
commit
a4fc736006
1 changed files with 9 additions and 6 deletions
15
src/xterm.c
15
src/xterm.c
|
|
@ -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) */
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue