diff options
| author | Michael Ennen <mike.ennen@gmail.com> | 2016-04-21 12:45:15 -0700 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-05-06 10:39:39 -0400 |
| commit | 6396beb432a59c204883f737577a37a4c06a7bc7 (patch) | |
| tree | b0aa901f9a4977fd08548dd02c6a897ee5122554 | |
| parent | 71ac92efc743b3580150fb72e1c90b4c21a35916 (diff) | |
| download | rneovim-6396beb432a59c204883f737577a37a4c06a7bc7.tar.gz rneovim-6396beb432a59c204883f737577a37a4c06a7bc7.tar.bz2 rneovim-6396beb432a59c204883f737577a37a4c06a7bc7.zip | |
vim-patch:7.4.1091 #4627
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.
https://github.com/vim/vim/commit/b01f357791f88c7083e58cf2b36509dd83f21ea2
| -rw-r--r-- | src/nvim/misc1.c | 5 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/nvim/misc1.c b/src/nvim/misc1.c index 53eceaa4ef..48791384a6 100644 --- a/src/nvim/misc1.c +++ b/src/nvim/misc1.c @@ -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(); diff --git a/src/nvim/version.c b/src/nvim/version.c index b0c93533cf..35b13d6e9e 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -587,7 +587,7 @@ static int included_patches[] = { // 1094, 1093, 1092, - // 1091, + 1091, // 1090, 1089, 1088, |