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 47b8a04e14f6f9df4b2383af88ca73b674d23d21..431e40727c4ef9110c6329f3ad97d22daeb0f660 100644 (file)
--- 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 9c252746da588fcdd9bfdf0c6935caf855c729ee..4af3f65a702424bbc0ddabe0f9fd5c1395ff94af 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 */
+/**/
+    1359,
 /**/
     1358,
 /**/