diff options
| author | davix <daviseago@gmail.com> | 2016-09-11 21:16:36 +0800 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-09-11 15:16:36 +0200 |
| commit | 13db9236fe5ec5cd69ac8aa80b5adcc3db842cbe (patch) | |
| tree | a474daac43841e170fe9d057f9980d86074e7865 /src | |
| parent | c4c29696245b9ef03935335f464dbaa2b46c2ba5 (diff) | |
| download | rneovim-13db9236fe5ec5cd69ac8aa80b5adcc3db842cbe.tar.gz rneovim-13db9236fe5ec5cd69ac8aa80b5adcc3db842cbe.tar.bz2 rneovim-13db9236fe5ec5cd69ac8aa80b5adcc3db842cbe.zip | |
vim-patch:7.4.1535 (#5327)
Problem: The feedkeys test has a one second delay.
Solution: Avoid need_wait_return() to delay. (Hirohito Higashi)
https://github.com/vim/vim/commit/9e496854a9fe56699687a4f86003fad115b3b375
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/api/vim.c | 5 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c index b1572037cb..70e0c55528 100644 --- a/src/nvim/api/vim.c +++ b/src/nvim/api/vim.c @@ -92,7 +92,12 @@ void nvim_feedkeys(String keys, String mode, Boolean escape_csi) typebuf_was_filled = true; } if (execute) { + int save_msg_scroll = msg_scroll; + + /* Avoid a 1 second delay when the keys start Insert mode. */ + msg_scroll = false; exec_normal(true); + msg_scroll |= save_msg_scroll; } } diff --git a/src/nvim/version.c b/src/nvim/version.c index 37e3369a1a..3f53391d74 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -743,7 +743,7 @@ static int included_patches[] = { // 1538 NA // 1537 NA // 1536 NA - // 1535, + 1535, // 1534 NA 1533, // 1532 NA |