Mercurial > emacs
changeset 2285:f0a979beceab
* xterm.c (x_term_init): If the X connection is already in file
descriptor zero, don't dup it and close the old one.
| author | Jim Blandy <jimb@redhat.com> |
|---|---|
| date | Sat, 20 Mar 1993 21:07:59 +0000 |
| parents | bba90ce247b0 |
| children | 7f66b40a0192 |
| files | src/xterm.c |
| diffstat | 1 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xterm.c Sat Mar 20 20:56:55 1993 +0000 +++ b/src/xterm.c Sat Mar 20 21:07:59 1993 +0000 @@ -4557,17 +4557,20 @@ 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) */