[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100135: * xterm.c (x_connection_closed): Kill Emacs unconditionally.

[Chong Yidong]

------------------------------------------------------------
revno: 100135
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Sun 2010-10-24 17:05:11 -0400
message:
  * xterm.c (x_connection_closed): Kill Emacs unconditionally.
modified:
  src/ChangeLog
  src/xterm.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-10-22 10:35:31 +0000
+++ b/src/ChangeLog     2010-10-24 21:05:11 +0000
@@ -1,3 +1,7 @@
+2010-10-24  Chong Yidong  <address@hidden>
+
+       * xterm.c (x_connection_closed): Kill Emacs unconditionally.
+
 2010-10-22  Eli Zaretskii  <address@hidden>
 
        * frame.c (Fframep, Fwindow_system): Deprecate use as a predicate.

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2010-09-12 13:23:59 +0000
+++ b/src/xterm.c       2010-10-24 21:05:11 +0000
@@ -7911,15 +7911,12 @@
 #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);
+      /* Due to bugs in some Gtk+ versions, just exit here. */
+      {
+       fprintf (stderr, "%s\n", error_msg);
+       Fkill_emacs (make_number (70));
+       abort ();  /* NOTREACHED */
+      }
 #endif
 
       /* Indicate that this display is dead.  */