From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 12 Feb 2008 04:05:29 +0000 (+0000)
Subject: (read_avail_input): Call Fdelete_terminal.
X-Git-Tag: emacs-pretest-23.0.90~7986
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=adf6a42938bc0177388f525c1089ad9f09d797d5;p=emacs.git

(read_avail_input): Call Fdelete_terminal.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index da46657e2f6..0f47ead5f1f 100644
--- 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 78298b96681..21904bf9c28 100644
--- 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)