diff options
| -rw-r--r-- | src/testdir/runtest.vim | 1 | ||||
| -rw-r--r-- | src/testdir/test_mapping.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim index 32c22fa33..1df7fd96a 100644 --- a/src/testdir/runtest.vim +++ b/src/testdir/runtest.vim @@ -322,6 +322,7 @@ let s:flaky_tests = [ \ 'Test_diff_screen()', \ 'Test_exit_callback()', \ 'Test_exit_callback_interval()', + \ 'Test_map_timeout_with_timer_interrupt()', \ 'Test_nb_basic()', \ 'Test_open_delay()', \ 'Test_out_cb()', diff --git a/src/testdir/test_mapping.vim b/src/testdir/test_mapping.vim index 6b9fb9ca1..93a4d4b85 100644 --- a/src/testdir/test_mapping.vim +++ b/src/testdir/test_mapping.vim @@ -298,7 +298,7 @@ func Test_map_timeout_with_timer_interrupt() let g:val = 0 nnoremap \12 :let g:val = 1<CR> nnoremap \123 :let g:val = 2<CR> - set timeout timeoutlen=100 + set timeout timeoutlen=200 func ExitCb(job, status) let g:timer = timer_start(1, {-> feedkeys("3\<Esc>", 't')}) diff --git a/src/version.c b/src/version.c index 66bd86fc7..cf96d640f 100644 --- a/src/version.c +++ b/src/version.c @@ -770,6 +770,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1860, +/**/ 1859, /**/ 1858, |