# HG changeset patch # User Jan Dj¸«£rv # Date 1259171634 0 # Node ID af182a117edd0eb391452ddc22afe5ce5c0118a6 # Parent 20e6e5b85a34efbf0eae2885daa67803847e57ba (delete_tty): Remove check for last terminal (bug#4970). diff -r 20e6e5b85a34 -r af182a117edd src/ChangeLog --- a/src/ChangeLog Wed Nov 25 17:23:45 2009 +0000 +++ b/src/ChangeLog Wed Nov 25 17:53:54 2009 +0000 @@ -1,5 +1,7 @@ 2009-11-25 Jan DjƤrv + * 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 -r 20e6e5b85a34 -r af182a117edd src/term.c --- a/src/term.c Wed Nov 25 17:23:45 2009 +0000 +++ b/src/term.c Wed Nov 25 17:53:54 2009 +0000 @@ -3951,8 +3951,6 @@ 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 @@ 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