# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1190323621 0
# Node ID 0d8dd9a91520791c024fb3b89d973887c8d92073
# Parent  920b65c5b922024018c66756114834dda396a7c9
(get_tty_terminal): Don't treat output_initial specially.
(Fsuspend_tty, Fresume_tty): Use terminal objects rather than ints.
(delete_tty): Use terminal->name as liveness status.

diff -r 920b65c5b922 -r 0d8dd9a91520 src/term.c
--- a/src/term.c	Thu Sep 20 21:26:01 2007 +0000
+++ b/src/term.c	Thu Sep 20 21:27:01 2007 +0000
@@ -2118,9 +2118,6 @@
 {
   struct terminal *t = get_terminal (terminal, throw);
 
-  if (t && t->type == output_initial)
-    return NULL;
-
   if (t && t->type != output_termcap)
     {
       if (throw)
@@ -2269,7 +2266,7 @@
         {
           Lisp_Object args[2];
           args[0] = intern ("suspend-tty-functions");
-          args[1] = make_number (t->id);
+          XSETTERMINAL (args[1], t);
           Frun_hook_with_args (2, args);
         }
     }
@@ -2334,7 +2331,7 @@
         {
           Lisp_Object args[2];
           args[0] = intern ("resume-tty-functions");
-          args[1] = make_number (t->id);
+          XSETTERMINAL (args[1], t);
           Frun_hook_with_args (2, args);
         }
     }
@@ -3783,7 +3780,7 @@
   
   /* Protect against recursive calls.  Fdelete_frame in
      delete_terminal calls us back when it deletes our last frame.  */
-  if (terminal->deleted)
+  if (!terminal->name)
     return;
 
   if (terminal->type != output_termcap)