From 5b8de9c5e6ae9df7de19ad97143553eeb8a2573a Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 11 Feb 2008 03:51:39 +0000 Subject: [PATCH] (Fdelete_terminal): Clean up the `force' path. --- src/ChangeLog | 4 ++++ src/terminal.c | 19 ++++++++++--------- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 782b2de808..eec823906f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2008-02-11 Stefan Monnier + + * terminal.c (Fdelete_terminal): Clean up the `force' path. + 2008-02-10 Stefan Monnier * frame.c (Qnoelisp): New symbol. diff --git a/src/terminal.c b/src/terminal.c index 2e0bcbb45a..bbc2fd74c2 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -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); -- 2.20.1