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
index 344de1f0a36d6808772596eef33505bd2c7cb2d5..70a41e90fd77c01fa262d896075cb49a53af2175 100644 (file)
--- 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
index 6ddcea6e0551dcdf33707ecf0b72c85bb31066e0..70bed2c7cf1552e41aa5c51b5b5e3573fd81261e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2242,
 /**/
     2241,
 /**/