diff options
| author | Jurica Bradaric <jbradaric@gmail.com> | 2017-03-20 21:11:24 +0100 |
|---|---|---|
| committer | Jurica Bradaric <jbradaric@gmail.com> | 2017-03-20 21:15:56 +0100 |
| commit | 3558f89d22faad613e0049592d2187ad35f5bec8 (patch) | |
| tree | 3fff6ab5bef8fe5ad6199e01ae41b6e2d149d5f4 /src | |
| parent | 5c2f1e29e3dfdfab8c2a9b31962d9cc12c171e46 (diff) | |
| download | rneovim-3558f89d22faad613e0049592d2187ad35f5bec8.tar.gz rneovim-3558f89d22faad613e0049592d2187ad35f5bec8.tar.bz2 rneovim-3558f89d22faad613e0049592d2187ad35f5bec8.zip | |
vim-patch:7.4.2241
Problem: Timer test sometimes fails.
Solution: Increase the maximum time for repeating timer.
https://github.com/vim/vim/commit/973365dcc40a41e6b72ece56f15cebfee69b1329
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/testdir/test_timers.vim | 2 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/testdir/test_timers.vim b/src/nvim/testdir/test_timers.vim index 2a5fa5c662..8829b5de59 100644 --- a/src/nvim/testdir/test_timers.vim +++ b/src/nvim/testdir/test_timers.vim @@ -32,7 +32,7 @@ func Test_repeat_three() let slept = WaitFor('g:val == 3') call assert_equal(3, g:val) if has('reltime') - call assert_inrange(150, 200, slept) + call assert_inrange(150, 250, slept) else call assert_inrange(80, 200, slept) endif diff --git a/src/nvim/version.c b/src/nvim/version.c index ef6c9d1454..b7516e443a 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -200,7 +200,7 @@ static int included_patches[] = { // 2244, // 2243 NA // 2242, - // 2241, + 2241, 2240, // 2239, // 2238 NA |