aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nvim/testdir/test_timers.vim2
-rw-r--r--src/nvim/version.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/testdir/test_timers.vim b/src/nvim/testdir/test_timers.vim
index 8829b5de59..db10f351ae 100644
--- a/src/nvim/testdir/test_timers.vim
+++ b/src/nvim/testdir/test_timers.vim
@@ -57,7 +57,7 @@ func Test_with_partial_callback()
let slept = WaitFor('g:val == 1')
call assert_equal(1, g:val)
if has('reltime')
- call assert_inrange(50, 100, slept)
+ call assert_inrange(50, 130, slept)
else
call assert_inrange(20, 100, slept)
endif
diff --git a/src/nvim/version.c b/src/nvim/version.c
index b7516e443a..91c37658aa 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -199,7 +199,7 @@ static int included_patches[] = {
// 2245,
// 2244,
// 2243 NA
- // 2242,
+ 2242,
2241,
2240,
// 2239,