patch 7.4.1301

Problem:    Missing options in ch_open().
Solution:   Add s:chopt like in the other calls. (Ozaki Kiichi)

diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index d77778a3e760ebcdc9d2f9d6649cc79bc4f0e7f3..6e5bbbb52d012f0e2a15d3778ac4951063bdf8e0 100644 (file)
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -161,7 +161,7 @@ endfunc
 
 " Test that we can open two channels.
 func s:two_channels(port)
-  let handle = ch_open('localhost:' . a:port)
+  let handle = ch_open('localhost:' . a:port, s:chopt)
   if handle < 0
     call assert_false(1, "Can't open channel")
     return

diff --git a/src/version.c b/src/version.c
index e19d205d3074f5299567998267a02d4570892a11..36225331ee4afcb2bffb719fd79a9bd3058674be 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 */
+/**/
+    1301,
 /**/
     1300,
 /**/