1
0
forked from aniani/vim

patch 8.1.0822: peeking and flushing output slows down execution

Problem:    Peeking and flushing output slows down execution.
Solution:   Do not update the mode message when global_busy is set.  Do not
            flush when only peeking for a character. (Ken Takata)
This commit is contained in:
Bram Moolenaar 2019-01-25 22:29:57 +01:00
parent 970f5d39f2
commit cb574f4154
5 changed files with 29 additions and 13 deletions

View File

@ -8722,7 +8722,7 @@ ins_esc(
*/
if (reg_recording != 0 || restart_edit != NUL)
showmode();
else if (p_smd)
else if (p_smd && !skip_showmode())
msg("");
return TRUE; /* exit Insert mode */

View File

@ -3039,9 +3039,10 @@ inchar(
/*
* Always flush the output characters when getting input characters
* from the user.
* from the user and not just peeking.
*/
out_flush();
if (wait_time == -1L || wait_time > 10L)
out_flush();
/*
* Fill up to a third of the buffer, because each character may be

View File

@ -49,6 +49,7 @@ int win_ins_lines(win_T *wp, int row, int line_count, int invalid, int mayclear)
int win_del_lines(win_T *wp, int row, int line_count, int invalid, int mayclear, int clear_attr);
int screen_ins_lines(int off, int row, int line_count, int end, int clear_attr, win_T *wp);
int screen_del_lines(int off, int row, int line_count, int end, int force, int clear_attr, win_T *wp);
int skip_showmode(void);
int showmode(void);
void unshowmode(int force);
void clearmode(void);

View File

@ -10109,6 +10109,26 @@ screen_del_lines(
return OK;
}
/*
* Return TRUE when postponing displaying the mode message: when not redrawing
* or inside a mapping.
*/
int
skip_showmode()
{
// Call char_avail() only when we are going to show something, because it
// takes a bit of time. redrawing() may also call char_avail_avail().
if (global_busy
|| msg_silent != 0
|| !redrawing()
|| (char_avail() && !KeyTyped))
{
redraw_cmdline = TRUE; // show mode later
return TRUE;
}
return FALSE;
}
/*
* Show the current mode and ruler.
*
@ -10135,16 +10155,8 @@ showmode(void)
|| VIsual_active));
if (do_mode || reg_recording != 0)
{
/*
* Don't show mode right now, when not redrawing or inside a mapping.
* Call char_avail() only when we are going to show something, because
* it takes a bit of time.
*/
if (!redrawing() || (char_avail() && !KeyTyped) || msg_silent != 0)
{
redraw_cmdline = TRUE; /* show mode later */
return 0;
}
if (skip_showmode())
return 0; // show mode later
nwr_save = need_wait_return;

View File

@ -787,6 +787,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
822,
/**/
821,
/**/