diff options
| author | Dmitry Antipov | 2013-10-11 15:11:28 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2013-10-11 15:11:28 +0400 |
| commit | 7d563e363c72828b9b1bbb0181be6a36643ce7af (patch) | |
| tree | 2dbd4337e1be6482b9fd653af530ae65009f764d /src | |
| parent | 48621e69064ea74eef6530d299cdc3548e170ce2 (diff) | |
| download | emacs-7d563e363c72828b9b1bbb0181be6a36643ce7af.tar.gz emacs-7d563e363c72828b9b1bbb0181be6a36643ce7af.zip | |
* dispnew.c (redraw_frame): Remove useless #ifdef because
FRAME_MSDOS_P is a compile-time zero everywhere except MS-DOS.
Also, move TTY fflush to...
* term.c (tty_update_end): ...this function.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/dispnew.c | 4 | ||||
| -rw-r--r-- | src/term.c | 1 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6947c5eddd5..74bb2a06cb9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2013-10-11 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 2 | |||
| 3 | * dispnew.c (redraw_frame): Remove useless #ifdef because | ||
| 4 | FRAME_MSDOS_P is a compile-time zero everywhere except MS-DOS. | ||
| 5 | Also, move TTY fflush to... | ||
| 6 | * term.c (tty_update_end): ...this function. | ||
| 7 | |||
| 1 | 2013-10-11 Eli Zaretskii <eliz@gnu.org> | 8 | 2013-10-11 Eli Zaretskii <eliz@gnu.org> |
| 2 | 9 | ||
| 3 | * xdisp.c (display_tty_menu_item): Make sure we never write beyond | 10 | * xdisp.c (display_tty_menu_item): Make sure we never write beyond |
diff --git a/src/dispnew.c b/src/dispnew.c index e3a1c1b49cb..d01de185332 100644 --- a/src/dispnew.c +++ b/src/dispnew.c | |||
| @@ -2937,15 +2937,11 @@ redraw_frame (struct frame *f) | |||
| 2937 | /* Error if F has no glyphs. */ | 2937 | /* Error if F has no glyphs. */ |
| 2938 | eassert (f->glyphs_initialized_p); | 2938 | eassert (f->glyphs_initialized_p); |
| 2939 | update_begin (f); | 2939 | update_begin (f); |
| 2940 | #ifdef MSDOS | ||
| 2941 | if (FRAME_MSDOS_P (f)) | 2940 | if (FRAME_MSDOS_P (f)) |
| 2942 | FRAME_TERMINAL (f)->set_terminal_modes_hook (FRAME_TERMINAL (f)); | 2941 | FRAME_TERMINAL (f)->set_terminal_modes_hook (FRAME_TERMINAL (f)); |
| 2943 | #endif | ||
| 2944 | clear_frame (f); | 2942 | clear_frame (f); |
| 2945 | clear_current_matrices (f); | 2943 | clear_current_matrices (f); |
| 2946 | update_end (f); | 2944 | update_end (f); |
| 2947 | if (FRAME_TERMCAP_P (f)) | ||
| 2948 | fflush (FRAME_TTY (f)->output); | ||
| 2949 | windows_or_buffers_changed++; | 2945 | windows_or_buffers_changed++; |
| 2950 | /* Mark all windows as inaccurate, so that every window will have | 2946 | /* Mark all windows as inaccurate, so that every window will have |
| 2951 | its redisplay done. */ | 2947 | its redisplay done. */ |
diff --git a/src/term.c b/src/term.c index 9437faee8a2..27471775d03 100644 --- a/src/term.c +++ b/src/term.c | |||
| @@ -220,6 +220,7 @@ tty_update_end (struct frame *f) | |||
| 220 | tty_show_cursor (tty); | 220 | tty_show_cursor (tty); |
| 221 | tty_turn_off_insert (tty); | 221 | tty_turn_off_insert (tty); |
| 222 | tty_background_highlight (tty); | 222 | tty_background_highlight (tty); |
| 223 | fflush (tty->output); | ||
| 223 | } | 224 | } |
| 224 | 225 | ||
| 225 | /* The implementation of set_terminal_window for termcap frames. */ | 226 | /* The implementation of set_terminal_window for termcap frames. */ |