summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_timers.vim4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim
index dc01d84b8..f40213ddd 100644
--- a/src/testdir/test_timers.vim
+++ b/src/testdir/test_timers.vim
@@ -152,7 +152,7 @@ func StopTimer1(timer)
let g:timer2 = timer_start(10, 'StopTimer2')
" avoid maxfuncdepth error
call timer_pause(g:timer1, 1)
- sleep 40m
+ sleep 20m
endfunc
func StopTimer2(timer)
@@ -162,7 +162,7 @@ endfunc
func Test_timer_stop_in_callback()
call assert_equal(0, len(timer_info()))
let g:timer1 = timer_start(10, 'StopTimer1')
- sleep 40m
+ sleep 50m
call assert_equal(0, len(timer_info()))
endfunc
diff --git a/src/version.c b/src/version.c
index 3adfdd059..f3de68b89 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 */
/**/
+ 1864,
+/**/
1863,
/**/
1862,