patch 7.4.1287

Problem:    Channel test fails.
Solution:   Use reltimefloat().

diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 8fcc73b41ebd701095d12e14c6f8e83a1697dd90..e5903ae425fdb80522b7033d4173539e59974b9b 100644 (file)
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -187,7 +187,7 @@ func Test_connect_waittime()
     call ch_close(handle)
   else
     let elapsed = reltime(start)
-    call assert_true(elapsed < 1.0)
+    call assert_true(reltimefloat(elapsed) < 1.0)
   endif
 
   let start = reltime()
@@ -198,6 +198,6 @@ func Test_connect_waittime()
   else
     " Failed connection doesn't wait the full time.
     let elapsed = reltime(start)
-    call assert_true(elapsed < 1.0)
+    call assert_true(reltimefloat(elapsed) < 1.0)
   endif
 endfunc

diff --git a/src/version.c b/src/version.c
index 6634f60861a94b8098a1867b58c0c05ca7dcfebd..a857cf1fc65f847881c0c065f25a31f0815ba3eb 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -747,6 +747,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1287,
 /**/
     1286,
 /**/