From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 24 Oct 2010 21:05:11 +0000 (-0400)
Subject: * xterm.c (x_connection_closed): Kill Emacs unconditionally.
X-Git-Tag: emacs-pretest-23.2.90~45
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=23c261f58fceed14e04b3ba928007fde9567d8e2;p=emacs.git

* xterm.c (x_connection_closed): Kill Emacs unconditionally.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index d8e0727b81b..98d6e0b1ca1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-24  Chong Yidong  <cyd@stupidchicken.com>
+
+	* xterm.c (x_connection_closed): Kill Emacs unconditionally.
+
 2010-10-22  Eli Zaretskii  <eliz@gnu.org>
 
 	* frame.c (Fframep, Fwindow_system): Deprecate use as a predicate.
diff --git a/src/xterm.c b/src/xterm.c
index 1fee90754fc..1de49e2fde1 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -7911,15 +7911,12 @@ x_connection_closed (dpy, error_message)
 #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.  */