kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-20 03:05:11 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:7.4.1091 #4627

Browse Source 
Problem:    When making a change while need_wait_return is set there is a two
            second delay.
Solution:   Do not assume the ATTENTION prompt was given when need_wait_return
            was set already.

b01f357791
This commit is contained in:
Michael Ennen 2016-04-21 12:45:15 -07:00 committed by Justin M. Keyes
parent 71ac92efc7
commit 6396beb432
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/nvim/misc1.c
View File

@ -1777,6 +1777,9 @@ void changed(void)
if (curbuf->b_may_swap
&& !bt_dontwrite(curbuf)
) {
int save_need_wait_return = need_wait_return;
need_wait_return = false;
ml_open_file(curbuf);
/* The ml_open_file() can cause an ATTENTION message.
@ -1788,6 +1791,8 @@ void changed(void)
os_delay(2000L, true);
wait_return(TRUE);
msg_scroll = save_msg_scroll;
} else {
need_wait_return = save_need_wait_return;
}
}
changed_int();

2
src/nvim/version.c
View File

@ -587,7 +587,7 @@ static int included_patches[] = {
// 1094,
1093,
1092,
// 1091,
1091,
// 1090,
1089,
1088,