summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_channel.vim4
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 8fcc73b41..e5903ae42 100644
--- 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 6634f6086..a857cf1fc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1287,
+/**/
1286,
/**/
1285,