Commit c523e161 authored by Jan Djärv's avatar Jan Djärv
Browse files

(x_connection_closed): For GTK: If this is the last

terminal just exit without closing the display.
parent cf358568
2008-03-11 Jan Dj$(Q)Z(Brv <jan.h.d@swipnet.se>
* xterm.c (x_connection_closed): For GTK: If this is the last
terminal just exit without closing the display.
2008-03-11 Jason Rumney <jasonr@gnu.org> 2008-03-11 Jason Rumney <jasonr@gnu.org>
* w32font.c (w32font_full_name): Use floor to round. * w32font.c (w32font_full_name): Use floor to round.
......
...@@ -8110,7 +8110,7 @@ x_connection_closed (dpy, error_message) ...@@ -8110,7 +8110,7 @@ x_connection_closed (dpy, error_message)
OpenWindows in certain situations. I suspect that is a bug OpenWindows in certain situations. I suspect that is a bug
in OpenWindows. I don't know how to circumvent it here. */ in OpenWindows. I don't know how to circumvent it here. */
if (dpyinfo) if (dpyinfo && terminal_list->next_terminal != NULL)
{ {
#ifdef USE_X_TOOLKIT #ifdef USE_X_TOOLKIT
/* If DPYINFO is null, this means we didn't open the display /* If DPYINFO is null, this means we didn't open the display
...@@ -8124,6 +8124,14 @@ x_connection_closed (dpy, error_message) ...@@ -8124,6 +8124,14 @@ x_connection_closed (dpy, error_message)
#endif #endif
#ifdef USE_GTK #ifdef USE_GTK
/* Due to bugs in some Gtk+ versions, just exit here if this
is the last display/terminal. */
if (terminal_list->next_terminal == NULL)
{
fprintf (stderr, "%s\n", error_msg);
shut_down_emacs (0, 0, Qnil);
exit (70);
}
xg_display_close (dpyinfo->display); xg_display_close (dpyinfo->display);
#endif #endif
......
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