aboutsummaryrefslogtreecommitdiffstats
path: root/src/term.c
diff options
context:
space:
mode:
authorJan Djärv2009-11-25 17:53:54 +0000
committerJan Djärv2009-11-25 17:53:54 +0000
commita1fadc6fdff31d8ceb9036333a12f494d10d7a53 (patch)
tree63db6d7b7c16a294d8b11566e63e0389f2efdc8e /src/term.c
parenta601d3134020e10162d4b8c9af0039478ed532ea (diff)
downloademacs-a1fadc6fdff31d8ceb9036333a12f494d10d7a53.tar.gz
emacs-a1fadc6fdff31d8ceb9036333a12f494d10d7a53.zip
(delete_tty): Remove check for last terminal (bug#4970).
Diffstat (limited to 'src/term.c')
-rw-r--r--src/term.c15
1 files changed, 0 insertions, 15 deletions
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
3951delete_tty (struct terminal *terminal) 3951delete_tty (struct terminal *terminal)
3952{ 3952{
3953 struct tty_display_info *tty; 3953 struct tty_display_info *tty;
3954 Lisp_Object tail, frame;
3955 int last_terminal;
3956 3954
3957 /* Protect against recursive calls. delete_frame in 3955 /* Protect against recursive calls. delete_frame in
3958 delete_terminal calls us back when it deletes our last frame. */ 3956 delete_terminal calls us back when it deletes our last frame. */
@@ -3964,19 +3962,6 @@ delete_tty (struct terminal *terminal)
3964 3962
3965 tty = terminal->display_info.tty; 3963 tty = terminal->display_info.tty;
3966 3964
3967 last_terminal = 1;
3968 FOR_EACH_FRAME (tail, frame)
3969 {
3970 struct frame *f = XFRAME (frame);
3971 if (FRAME_LIVE_P (f) && (!FRAME_TERMCAP_P (f) || FRAME_TTY (f) != tty))
3972 {
3973 last_terminal = 0;
3974 break;
3975 }
3976 }
3977 if (last_terminal)
3978 error ("Attempt to delete the sole terminal device with live frames");
3979
3980 if (tty == tty_list) 3965 if (tty == tty_list)
3981 tty_list = tty->next; 3966 tty_list = tty->next;
3982 else 3967 else