aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2008-10-04 15:27:56 +0000
committerEli Zaretskii2008-10-04 15:27:56 +0000
commit7d2f1216b7ef820bd964b5fe0ca7d38be8e8fd2e (patch)
treec52a02f39b6db0f8fe807830ce1d5034452611f6
parent6dfab00d57392a6453a4ed7286c9edca3ff6320e (diff)
downloademacs-7d2f1216b7ef820bd964b5fe0ca7d38be8e8fd2e.tar.gz
emacs-7d2f1216b7ef820bd964b5fe0ca7d38be8e8fd2e.zip
(update_frame): Flush termscript for MSDOS frames as well as for TTY.
(Fopen_termscript): Allow opening a termscript on MSDOS frames as well as on a TTY.
-rw-r--r--src/ChangeLog8
-rw-r--r--src/dispnew.c8
2 files changed, 13 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 8485c24e645..46f8ab3b60e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,13 @@
12008-10-04 Eli Zaretskii <eliz@gnu.org> 12008-10-04 Eli Zaretskii <eliz@gnu.org>
2 2
3 * xdisp.c (redisplay_internal): If frame switched, redisplay the
4 whole thing on MSDOS frames as well as on a TTY.
5
6 * dispnew.c (update_frame): Flush termscript for MSDOS frames as
7 well as for TTY.
8 (Fopen_termscript): Allow opening a termscript on MSDOS frames as
9 well as on a TTY.
10
3 * sysdep.c (init_sys_modes): Set FRAME_GARBAGED_P for MSDOS frames 11 * sysdep.c (init_sys_modes): Set FRAME_GARBAGED_P for MSDOS frames
4 as well as for TTY. 12 as well as for TTY.
5 13
diff --git a/src/dispnew.c b/src/dispnew.c
index afb60ab89d0..45b5756665c 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -3954,11 +3954,12 @@ update_frame (f, force_p, inhibit_hairy_id_p)
3954 paused_p = update_frame_1 (f, force_p, inhibit_hairy_id_p); 3954 paused_p = update_frame_1 (f, force_p, inhibit_hairy_id_p);
3955 update_end (f); 3955 update_end (f);
3956 3956
3957 if (FRAME_TERMCAP_P (f)) 3957 if (FRAME_TERMCAP_P (f) || FRAME_MSDOS_P (f))
3958 { 3958 {
3959 if (FRAME_TTY (f)->termscript) 3959 if (FRAME_TTY (f)->termscript)
3960 fflush (FRAME_TTY (f)->termscript); 3960 fflush (FRAME_TTY (f)->termscript);
3961 fflush (FRAME_TTY (f)->output); 3961 if (FRAME_TERMCAP_P (f))
3962 fflush (FRAME_TTY (f)->output);
3962 } 3963 }
3963 3964
3964 /* Check window matrices for lost pointers. */ 3965 /* Check window matrices for lost pointers. */
@@ -6421,7 +6422,8 @@ FILE = nil means just close any termscript file currently open. */)
6421{ 6422{
6422 struct tty_display_info *tty; 6423 struct tty_display_info *tty;
6423 6424
6424 if (! FRAME_TERMCAP_P (SELECTED_FRAME ())) 6425 if (! FRAME_TERMCAP_P (SELECTED_FRAME ())
6426 && ! FRAME_MSDOS_P (SELECTED_FRAME ()))
6425 error ("Current frame is not on a tty device"); 6427 error ("Current frame is not on a tty device");
6426 6428
6427 tty = CURTTY (); 6429 tty = CURTTY ();