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 c8b25c63b..55f5245f3 100644 --- a/src/testdir/test_timers.vim +++ b/src/testdir/test_timers.vim @@ -122,7 +122,12 @@ func Test_paused() let slept = WaitFor('g:val == 1') call assert_equal(1, g:val) if has('reltime') - call assert_inrange(0, 30, slept) + if has('mac') + " The travis Mac machines appear to be very busy. + call assert_inrange(0, 40, slept) + else + call assert_inrange(0, 30, slept) + endif else call assert_inrange(0, 10, slept) endif diff --git a/src/version.c b/src/version.c index 6b3df0dbf..4f8dfd29c 100644 --- a/src/version.c +++ b/src/version.c @@ -772,6 +772,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1424, +/**/ 1423, /**/ 1422, |