[Emacs-diffs] Changes to emacs/src/xterm.c,v

[Jan Djärv]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Jan Djärv <jhd>        08/03/11 07:35:09

Index: xterm.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/xterm.c,v
retrieving revision 1.981
retrieving revision 1.982
diff -u -b -r1.981 -r1.982
--- xterm.c     3 Mar 2008 06:32:12 -0000       1.981
+++ xterm.c     11 Mar 2008 07:35:09 -0000      1.982
@@ -8110,7 +8110,7 @@
      OpenWindows in certain situations.  I suspect that is a bug
      in OpenWindows.  I don't know how to circumvent it here.  */
 
-  if (dpyinfo)
+  if (dpyinfo && terminal_list->next_terminal != NULL)
     {
 #ifdef USE_X_TOOLKIT
       /* If DPYINFO is null, this means we didn't open the display
@@ -8124,6 +8124,14 @@
 #endif
 
 #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);
 #endif