Commit a1fadc6f authored by Jan Djärv's avatar Jan Djärv

(delete_tty): Remove check for last terminal (bug#4970).

parent a601d313
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).
......
......@@ -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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment