patch 7.4.1687
Problem: The channel close_cb option does not work.
Solution: Use jo_close_partial instead of jo_err_partial. (Damien)
diff --git a/src/channel.c b/src/channel.c
index 98bc6be..b21c443 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -1103,7 +1103,7 @@
*cbp = vim_strsave(opt->jo_close_cb);
else
*cbp = NULL;
- *pp = opt->jo_err_partial;
+ *pp = opt->jo_close_partial;
if (*pp != NULL)
++(*pp)->pt_refcount;
}
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 5e34ad2..119f71a 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -1203,6 +1203,29 @@
call s:run_server('s:test_close_callback')
endfunc
+function s:test_close_partial(port)
+ let handle = ch_open('localhost:' . a:port, s:chopt)
+ if ch_status(handle) == "fail"
+ call assert_false(1, "Can't open channel")
+ return
+ endif
+ let s:d = {}
+ func s:d.closeCb(ch) dict
+ let self.close_ret = 'closed'
+ endfunc
+ call ch_setoptions(handle, {'close_cb': s:d.closeCb})
+
+ call assert_equal('', ch_evalexpr(handle, 'close me'))
+ call s:waitFor('"closed" == s:d.close_ret')
+ call assert_equal('closed', s:d.close_ret)
+ unlet s:d
+endfunc
+
+func Test_close_partial()
+ call ch_log('Test_close_partial()')
+ call s:run_server('s:test_close_partial')
+endfunc
+
func Test_job_start_invalid()
call assert_fails('call job_start($x)', 'E474:')
call assert_fails('call job_start("")', 'E474:')
diff --git a/src/version.c b/src/version.c
index f2976cb..6e599d8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1687,
+/**/
1686,
/**/
1685,