# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1202789129 0
# Node ID 395f252a021b6f0172b0a7e2effbc6ac8c75d618
# Parent  ad6ac471fdeae5846b7b27969f9b400bc7d10a2a
(read_avail_input): Call Fdelete_terminal.

diff -r ad6ac471fdea -r 395f252a021b src/ChangeLog
--- a/src/ChangeLog	Tue Feb 12 04:03:17 2008 +0000
+++ b/src/ChangeLog	Tue Feb 12 04:05:29 2008 +0000
@@ -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 -r ad6ac471fdea -r 395f252a021b src/keyboard.c
--- a/src/keyboard.c	Tue Feb 12 04:03:17 2008 +0000
+++ b/src/keyboard.c	Tue Feb 12 04:05:29 2008 +0000
@@ -7134,10 +7134,11 @@
                 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)