(read_avail_input): Call Fdelete_terminal.

diff --git a/src/ChangeLog b/src/ChangeLog
index da46657e2f6b5c48b8800640523e8b4ac4d714b0..0f47ead5f1f8128a77a14fd886c18446b7a050df 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,6 @@
 2008-02-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+       * keyboard.c (read_avail_input):
        * frame.c (Fdelete_frame): Call Fdelete_terminal.
 
 2008-02-11  Stefan Monnier  <monnier@iro.umontreal.ca>

diff --git a/src/keyboard.c b/src/keyboard.c
index 78298b96681534063f547edb8dd632e571372ee3..21904bf9c28154067329d785d6e19d0709964698 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -7134,10 +7134,11 @@ read_avail_input (expected)
                 kill (getpid (), SIGHUP);
 
               /* XXX Is calling delete_terminal safe here?  It calls Fdelete_frame. */
-              if (t->delete_terminal_hook)
-                (*t->delete_terminal_hook) (t);
-              else
-                delete_terminal (t);
+             {
+               Lisp_Object tmp;
+               XSETTERMINAL (tmp, t);
+               Fdelete_terminal (tmp, Qnoelisp);
+             }
             }
 
           if (hold_quit.kind != NO_EVENT)