# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1202788997 0
# Node ID ad6ac471fdeae5846b7b27969f9b400bc7d10a2a
# Parent  c568e49dbbc533f5b5d9caff031a31e0bd0de3ab
(Fdelete_frame): Call Fdelete_terminal.

diff -r c568e49dbbc5 -r ad6ac471fdea src/ChangeLog
--- a/src/ChangeLog	Tue Feb 12 03:46:03 2008 +0000
+++ b/src/ChangeLog	Tue Feb 12 04:03:17 2008 +0000
@@ -1,3 +1,7 @@
+2008-02-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* frame.c (Fdelete_frame): Call Fdelete_terminal.
+
 2008-02-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* buffer.c (clone_per_buffer_values, reset_buffer_local_variables)
diff -r c568e49dbbc5 -r ad6ac471fdea src/frame.c
--- a/src/frame.c	Tue Feb 12 03:46:03 2008 +0000
+++ b/src/frame.c	Tue Feb 12 04:03:17 2008 +0000
@@ -1538,11 +1538,11 @@
     terminal->reference_count--;
     if (terminal->reference_count == 0)
       {
+	Lisp_Object tmp;
+	XSETTERMINAL (tmp, terminal);
+
         kb = NULL;
-        if (terminal->delete_terminal_hook)
-          (*terminal->delete_terminal_hook) (terminal);
-        else
-          delete_terminal (terminal);
+	Fdelete_terminal (tmp, NILP (force) ? Qt : force);
       }
 #ifdef MULTI_KBOARD
     else