summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/testdir/runtest.vim1
-rw-r--r--src/testdir/test_timers.vim2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 1 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 9b41b46f1..fe02d889c 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -333,6 +333,7 @@ let s:flaky_tests = [
\ 'Test_quotestar()',
\ 'Test_raw_one_time_callback()',
\ 'Test_reltime()',
+ \ 'Test_repeat_many()',
\ 'Test_repeat_three()',
\ 'Test_server_crash()',
\ 'Test_terminal_ansicolors_default()',
diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim
index 367e46f94..caeb23014 100644
--- a/src/testdir/test_timers.vim
+++ b/src/testdir/test_timers.vim
@@ -43,7 +43,7 @@ func Test_repeat_many()
let timer = timer_start(50, 'MyHandler', {'repeat': -1})
sleep 200m
call timer_stop(timer)
- call assert_inrange(2, 4, g:val)
+ call assert_inrange(2, 5, g:val)
endfunc
func Test_with_partial_callback()
diff --git a/src/version.c b/src/version.c
index 93867b87d..abbb3b0e5 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 */
/**/
+ 1852,
+/**/
1851,
/**/
1850,