Mercurial > emacs
changeset 111162:bd94f8980f47
* xterm.c (x_connection_closed): Kill Emacs unconditionally.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Sun, 24 Oct 2010 17:05:11 -0400 |
| parents | 7cae32037c1d |
| children | bf6806de6892 2dcdfeb8d47c |
| files | src/ChangeLog src/xterm.c |
| diffstat | 2 files changed, 10 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sat Oct 23 14:12:38 2010 -0700 +++ b/src/ChangeLog Sun Oct 24 17:05:11 2010 -0400 @@ -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.
--- a/src/xterm.c Sat Oct 23 14:12:38 2010 -0700 +++ b/src/xterm.c Sun Oct 24 17:05:11 2010 -0400 @@ -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. */