changeset 91792:395f252a021b

(read_avail_input): Call Fdelete_terminal.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Tue, 12 Feb 2008 04:05:29 +0000
parents ad6ac471fdea
children ff93c8b2a389
files src/ChangeLog src/keyboard.c
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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>
--- 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)