From 174105f78985b7e0a1dd05b9924b0240fa66a4d3 Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Tue, 12 Feb 2008 04:03:17 +0000 Subject: [PATCH] (Fdelete_frame): Call Fdelete_terminal. --- src/ChangeLog | 4 ++++ src/frame.c | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index ee321261a10..da46657e2f6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2008-02-12 Stefan Monnier + + * frame.c (Fdelete_frame): Call Fdelete_terminal. + 2008-02-11 Stefan Monnier * buffer.c (clone_per_buffer_values, reset_buffer_local_variables) diff --git a/src/frame.c b/src/frame.c index 2ca30eb5c42..b163be53f77 100644 --- 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 -- 2.39.5