summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-02-10 23:28:21 +0100
committerBram Moolenaar <Bram@vim.org>2016-02-10 23:28:21 +0100
commit39b21272d521512b6ecac6cc0f310944f21b7443 (patch)
tree505f1fbd4ae9f4dcac7dc99bb1e2e9447fdd7eac
parent2ab375e54ef4eac438d1aef8b99d9e71f2fa0c63 (diff)
patch 7.4.1301v7.4.1301
Problem: Missing options in ch_open(). Solution: Add s:chopt like in the other calls. (Ozaki Kiichi)
-rw-r--r--src/testdir/test_channel.vim2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index d77778a3e7..6e5bbbb52d 100644
--- 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 e19d205d30..36225331ee 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 */
/**/
+ 1301,
+/**/
1300,
/**/
1299,