From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 22 Aug 2016 20:47:45 +0000 (+0200)
Subject: patch 7.4.2242
X-Git-Tag: v7.4.2242
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=17f1347b867cbcc0ce380bf9a2466b4c31896f04;p=vim

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 344de1f0a..70a41e90f 100644
--- 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 6ddcea6e0..70bed2c7c 100644
--- 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,
 /**/