diff options
| -rw-r--r-- | src/testdir/test_timers.vim | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/testdir/test_timers.vim b/src/testdir/test_timers.vim index 78676d211..e0d024b7a 100644 --- a/src/testdir/test_timers.vim +++ b/src/testdir/test_timers.vim @@ -73,7 +73,12 @@ func Test_timer_with_partial_callback() let slept = WaitFor('g:val == 1') call assert_equal(1, g:val) if has('reltime') - call assert_inrange(49, 130, slept) + " Mac on Travis can be slow. + if has('mac') + call assert_inrange(49, 180, slept) + else + call assert_inrange(49, 130, slept) + endif else call assert_inrange(20, 100, slept) endif diff --git a/src/version.c b/src/version.c index 420c722d2..0fc35dc83 100644 --- a/src/version.c +++ b/src/version.c @@ -743,6 +743,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 48, +/**/ 47, /**/ 46, |