diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-01-15 15:17:04 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-01-15 15:17:04 +0100 |
| commit | b01f357791f88c7083e58cf2b36509dd83f21ea2 (patch) | |
| tree | 2554602786daf3010427ab247c9f278a87f0100d | |
| parent | b5690794cf081773628fa0f1f2b948fd129d5b39 (diff) | |
patch 7.4.1091v7.4.1091
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.
| -rw-r--r-- | src/misc1.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/misc1.c b/src/misc1.c index d1e762c9a7..4f36fd80d1 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -2778,6 +2778,9 @@ changed() #endif ) { + 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. @@ -2791,6 +2794,8 @@ changed() wait_return(TRUE); msg_scroll = save_msg_scroll; } + else + need_wait_return = save_need_wait_return; } changed_int(); } diff --git a/src/version.c b/src/version.c index 80a0693b2f..3c196ad12f 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1091, +/**/ 1090, /**/ 1089, |