Commit 5b8de9c5 authored by Stefan Monnier's avatar Stefan Monnier

(Fdelete_terminal): Clean up the `force' path.

parent d725f53d
2008-02-11 Stefan Monnier <monnier@iro.umontreal.ca>
* terminal.c (Fdelete_terminal): Clean up the `force' path.
2008-02-10 Stefan Monnier <monnier@iro.umontreal.ca>
* frame.c (Qnoelisp): New symbol.
......
......@@ -305,19 +305,20 @@ but if the second argument FORCE is non-nil, you may do so. */)
(terminal, force)
Lisp_Object terminal, force;
{
struct terminal *t, *p;
t = get_terminal (terminal, 0);
struct terminal *t = get_terminal (terminal, 0);
if (!t)
return Qnil;
p = terminal_list;
while (p && (p == t || !TERMINAL_ACTIVE_P (p)))
p = p->next_terminal;
if (NILP (force) && !p)
error ("Attempt to delete the sole active display terminal");
if (NILP (force))
{
struct terminal *p = terminal_list;
while (p && (p == t || !TERMINAL_ACTIVE_P (p)))
p = p->next_terminal;
if (!p)
error ("Attempt to delete the sole active display terminal");
}
if (t->delete_terminal_hook)
(*t->delete_terminal_hook) (t);
......
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