(Fdelete_frame): Call Fdelete_terminal.

diff --git a/src/ChangeLog b/src/ChangeLog
index ee321261a1081a4c14526d454ea6ca4d2176479c..da46657e2f6b5c48b8800640523e8b4ac4d714b0 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/frame.c b/src/frame.c
index 2ca30eb5c42ec01f429bb2909d843613368520f0..b163be53f770482333ce8fd68683c313f69313f1 100644 (file)
--- a/src/frame.c
+++ b/src/frame.c
@@ -1538,11 +1538,11 @@ But FORCE inhibits this too.  */)
     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