Mercurial > emacs
changeset 4147:c6657758fb6f
* xterm.c (x_term_init): Adjust message printed when we can't
connect to the X server.
* xterm.c (XTread_socket, UnmapNotify case): Add missing comment
terminator.
* xterm.c, sysdep.c (F_SETOWN_BUG): Defined.
* m/dpx2.h: New file.
| author | Jim Blandy <jimb@redhat.com> |
|---|---|
| date | Sun, 18 Jul 1993 06:29:55 +0000 |
| parents | 0c681748d0ce |
| children | 6b065ebb9090 |
| files | src/xterm.c |
| diffstat | 1 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/xterm.c Sun Jul 18 06:29:19 1993 +0000 +++ b/src/xterm.c Sun Jul 18 06:29:55 1993 +0000 @@ -2861,7 +2861,7 @@ /* The window manager never makes a window invisible ("withdrawn"); all it does is switch between visible and iconified. Frames get into the invisible state - only through x_make_frame_invisible. + only through x_make_frame_invisible. */ if (FRAME_VISIBLE_P (f) || FRAME_ICONIFIED_P (f)) f->async_iconified = 1; } @@ -4707,15 +4707,18 @@ { Lisp_Object frame; char *defaultvalue; +#ifndef F_SETOWN_BUG #ifdef F_SETOWN extern int old_fcntl_owner; #endif /* ! defined (F_SETOWN) */ +#endif /* F_SETOWN_BUG */ x_focus_frame = x_highlight_frame = 0; x_current_display = XOpenDisplay (display_name); if (x_current_display == 0) - fatal ("X server %s not responding; check the DISPLAY environment variable or use \"-d\"\n", + fatal ("X server %s not responding.\n\ +Check the DISPLAY environment variable or use \"-d\"\n", display_name); #ifdef HAVE_X11 @@ -4780,6 +4783,7 @@ #endif /* ! defined (HAVE_X11) */ +#ifndef F_SETOWN_BUG #ifdef F_SETOWN old_fcntl_owner = fcntl (0, F_GETOWN, 0); #ifdef F_SETOWN_SOCK_NEG @@ -4788,6 +4792,7 @@ fcntl (0, F_SETOWN, getpid ()); #endif /* ! defined (F_SETOWN_SOCK_NEG) */ #endif /* ! defined (F_SETOWN) */ +#endif /* F_SETOWN_BUG */ #ifdef SIGIO init_sigio ();