diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-04-17 07:59:22 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-04-17 07:59:22 -0700 |
| commit | 5c1915d10b3716879785fe49f5cfe20beeb37090 (patch) | |
| tree | c504d2f73f7a690a3292b18e56e92c1f0a99890c | |
| parent | 6607a79c6e7c7554059557c0db78c26c57314f24 (diff) | |
| download | emacs-5c1915d10b3716879785fe49f5cfe20beeb37090.tar.gz | |
* term.c (tty_send_additional_strings): No need to fflush here,
as callers fflush.
(tty_set_terminal_modes): fflush after sending additional strings,
not before.
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/term.c | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 86dcd773a81..959a9613584 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2014-04-17 Paul Eggert <eggert@cs.ucla.edu> + + * term.c (tty_send_additional_strings): No need to fflush here, + as callers fflush. + (tty_set_terminal_modes): fflush after sending additional strings, + not before. + 2014-04-17 Daniel Colascione <dancol@dancol.org> * term.c (Qtty_mode_set_strings, Qtty_mode_reset_strings): New diff --git a/src/term.c b/src/term.c index 9d9d682a544..6ea9a4eba9a 100644 --- a/src/term.c +++ b/src/term.c @@ -165,7 +165,7 @@ tty_ring_bell (struct frame *f) /* Set up termcap modes for Emacs. */ static void -tty_send_additional_strings (struct terminal* terminal, Lisp_Object sym) +tty_send_additional_strings (struct terminal *terminal, Lisp_Object sym) { Lisp_Object lisp_terminal; Lisp_Object extra_codes; @@ -180,7 +180,6 @@ tty_send_additional_strings (struct terminal* terminal, Lisp_Object sym) if (STRINGP (string)) { fwrite (SDATA (string), 1, SBYTES (string), tty->output); - fflush (tty->output); if (tty->termscript) fwrite (SDATA (string), 1, SBYTES (string), tty->termscript); } @@ -209,8 +208,8 @@ tty_set_terminal_modes (struct terminal *terminal) OUTPUT_IF (tty, visible_cursor ? tty->TS_cursor_visible : tty->TS_cursor_normal); OUTPUT_IF (tty, tty->TS_keypad_mode); losecursor (tty); - fflush (tty->output); tty_send_additional_strings (terminal, Qtty_mode_set_strings); + fflush (tty->output); } } |