diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-10-24 17:05:11 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-10-24 17:05:11 -0400 |
| commit | c000cab10b175da6ebb56b8225acf51de1c3b6db (patch) | |
| tree | 817bdc12e1700cbb6d2b266efc41aa8332d538d9 /src | |
| parent | 3b0ec237b950cae0604ebf47d94955f451ba2c58 (diff) | |
| download | emacs-c000cab10b175da6ebb56b8225acf51de1c3b6db.tar.gz | |
* xterm.c (x_connection_closed): Kill Emacs unconditionally.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/xterm.c | 15 |
2 files changed, 10 insertions, 9 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5e2d262582b..08175bec7c8 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. */ |