(read_avail_input): Call Fdelete_terminal.

adf6a429 · Stefan Monnier · 174105f7 · adf6a429 · adf6a429
Commit adf6a429 authored Feb 12, 2008 by Stefan Monnier
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

src/ChangeLog src/ChangeLog +1 -0

src/keyboard.c src/keyboard.c +5 -4

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
 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
+++ 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)