diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2009-11-25 17:53:54 +0000 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2009-11-25 17:53:54 +0000 |
| commit | a1fadc6fdff31d8ceb9036333a12f494d10d7a53 (patch) | |
| tree | 63db6d7b7c16a294d8b11566e63e0389f2efdc8e | |
| parent | a601d3134020e10162d4b8c9af0039478ed532ea (diff) | |
| download | emacs-a1fadc6fdff31d8ceb9036333a12f494d10d7a53.tar.gz | |
(delete_tty): Remove check for last terminal (bug#4970).
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/term.c | 15 |
2 files changed, 2 insertions, 15 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 36032bd01df..e0bb722d851 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2009-11-25 Jan Djärv <jan.h.d@swipnet.se> + * term.c (delete_tty): Remove check for last terminal (bug#4970). + * xsettings.c: Revert changes from 2009-11-23. Just use Xft defaults (bug #5025). diff --git a/src/term.c b/src/term.c index d860a932357..fda06d6b2ed 100644 --- a/src/term.c +++ b/src/term.c @@ -3951,8 +3951,6 @@ static void delete_tty (struct terminal *terminal) { struct tty_display_info *tty; - Lisp_Object tail, frame; - int last_terminal; /* Protect against recursive calls. delete_frame in delete_terminal calls us back when it deletes our last frame. */ @@ -3964,19 +3962,6 @@ delete_tty (struct terminal *terminal) tty = terminal->display_info.tty; - last_terminal = 1; - FOR_EACH_FRAME (tail, frame) - { - struct frame *f = XFRAME (frame); - if (FRAME_LIVE_P (f) && (!FRAME_TERMCAP_P (f) || FRAME_TTY (f) != tty)) - { - last_terminal = 0; - break; - } - } - if (last_terminal) - error ("Attempt to delete the sole terminal device with live frames"); - if (tty == tty_list) tty_list = tty->next; else |