# HG changeset patch # User Christian Brabandt # Date 1471899608 -7200 # Node ID 88f9812ac47db6dd36bec4df33dd7190633f7f81 # Parent 2c4ab7379681dc0b23a56e08b0638ae8bbd9608c commit https://github.com/vim/vim/commit/17f1347b867cbcc0ce380bf9a2466b4c31896f04 Author: Bram Moolenaar Date: Mon Aug 22 22:47:45 2016 +0200 patch 7.4.2242 Problem: Timer test sometimes fails. Solution: Increase the maximum time for callback timer test. diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim --- a/src/testdir/test_timers.vim +++ b/src/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/version.c b/src/version.c --- 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 */ /**/ + 2242, +/**/ 2241, /**/ 2240,