From: Bram Moolenaar <Bram@vim.org>
Date: Fri, 19 Feb 2016 21:59:44 +0000 (+0100)
Subject: patch 7.4.1359
X-Git-Tag: v7.4.1359
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f6ef66254c1e25ef1c7972aa9a0ba119ebc17e4;p=thirdparty%2Fvim.git

patch 7.4.1359
Problem:    Channel test ch_sendexpr() times out.
Solution:   Increase the timeout
---

diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 47b8a04e14..431e40727c 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -146,7 +146,7 @@ func s:communicate(port)
 
   " check setting options (without testing the effect)
   call ch_setoptions(handle, {'callback': 's:NotUsed'})
-  call ch_setoptions(handle, {'timeout': 111})
+  call ch_setoptions(handle, {'timeout': 1111})
   call assert_fails("call ch_setoptions(handle, {'waittime': 111})", "E475")
   call assert_fails("call ch_setoptions(handle, {'mode': 'json'})", "E475")
 
diff --git a/src/version.c b/src/version.c
index 9c252746da..4af3f65a70 100644
--- 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 */
+/**/
+    1359,
 /**/
     1358,
 /**/