Mercurial > vim

changeset 8130:3462f9cfedf8 v7.4.1359

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/1f6ef66254c1e25ef1c7972aa9a0ba119ebc17e4 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Feb 19 22:59:44 2016 +0100 patch 7.4.1359 Problem: Channel test ch_sendexpr() times out. Solution: Increase the timeout
author Christian Brabandt <cb@256bit.org>
date Fri, 19 Feb 2016 23:00:06 +0100
parents 6b08fa169bd6
children b5632cf2e77a
files src/testdir/test_channel.vim src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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")
 
--- 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 */
 /**/
+    1359,
+/**/
     1358,
 /**/
     1357,