From c06981c06286a000c3046af21fb65d07748d8462 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 23 Aug 2008 16:50:44 +0000 Subject: [PATCH] Include frame.h before termhooks.h. (dos_cleanup): Use CURTTY ()->termscript instead of a global variable termscript. --- src/dosfns.c | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/dosfns.c b/src/dosfns.c index ac336c9a5df..240f19c3380 100644 --- a/src/dosfns.c +++ b/src/dosfns.c @@ -29,8 +29,8 @@ along with GNU Emacs. If not, see . */ #include "lisp.h" #include "buffer.h" #include "termchar.h" -#include "termhooks.h" #include "frame.h" +#include "termhooks.h" #include "blockinput.h" #include "window.h" #include "dosfns.h" @@ -536,15 +536,27 @@ If the underlying system call fails, value is nil. */) void dos_cleanup (void) { + struct tty_display_info *tty; + #ifndef HAVE_X_WINDOWS restore_parent_vm_title (); #endif /* Make sure the termscript file is committed, in case we are crashing and some vital info was written there. */ - if (termscript) + if (FRAMEP (selected_frame)) { - fflush (termscript); - fsync (fileno (termscript)); + struct frame *sf = XFRAME (selected_frame); + + if (FRAME_LIVE_P (sf) + && (FRAME_MSDOS_P (sf) || FRAME_TERMCAP_P (sf))) + { + tty = CURTTY (); + if (tty->termscript) + { + fflush (tty->termscript); + fsync (fileno (tty->termscript)); + } + } } } -- 2.39.5