summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-08-22 22:02:56 +0200
committerBram Moolenaar <Bram@vim.org>2016-08-22 22:02:56 +0200
commit973365dcc40a41e6b72ece56f15cebfee69b1329 (patch)
tree714d1ade35b502abff10b5bffcfad5ff8c33e185 /src
parentf267f8bdf777073e392ada5b31d837c7b6090eb4 (diff)
patch 7.4.2241v7.4.2241
Problem: Timer test sometimes fails. Solution: Increase the maximum time for repeating timer.
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_timers.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim
index 5b9e5c48aa..344de1f0a3 100644
--- a/src/testdir/test_timers.vim
+++ b/src/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/version.c b/src/version.c
index 88ea46c8b2..6ddcea6e05 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2241,
+/**/
2240,
/**/
2239,