[Emacs-diffs] Changes to emacs/src/terminal.c,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        08/02/11 03:51:40

Index: terminal.c
===================================================================
RCS file: /sources/emacs/emacs/src/terminal.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- terminal.c  10 Feb 2008 21:56:37 -0000      1.8
+++ terminal.c  11 Feb 2008 03:51:39 -0000      1.9
@@ -305,19 +305,20 @@
   (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;
+  if (NILP (force))
+    {
+      struct terminal *p = terminal_list;
   while (p && (p == t || !TERMINAL_ACTIVE_P (p)))
     p = p->next_terminal;
   
-  if (NILP (force) && !p)
+      if (!p)
     error ("Attempt to delete the sole active display terminal");
+    }
 
   if (t->delete_terminal_hook)
     (*t->delete_terminal_hook) (t);