Mercurial > emacs
changeset 91791:ad6ac471fdea
(Fdelete_frame): Call Fdelete_terminal.
| author | Stefan Monnier <monnier@iro.umontreal.ca> |
|---|---|
| date | Tue, 12 Feb 2008 04:03:17 +0000 |
| parents | c568e49dbbc5 |
| children | 395f252a021b |
| files | src/ChangeLog src/frame.c |
| diffstat | 2 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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)
--- 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