aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.2.0104: using channel or job with ":execute" has strange effects

Browse Source 
Problem:    Using channel or job with ":execute" has strange effects.
Solution:   Give an error message for Job and Channel.
This commit is contained in:
Bram Moolenaar
2020-01-08 20:09:01 +01:00
parent e2a8f0773e
commit b662591e50
3 changed files with 23 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/eval.c
View File

@@ -6055,7 +6055,15 @@ ex_execute(exarg_T *eap)
char_u buf[NUMBUFLEN]; char_u buf[NUMBUFLEN];
if (eap->cmdidx == CMD_execute) if (eap->cmdidx == CMD_execute)
p = tv_get_string_buf(&rettv, buf); {
if (rettv.v_type == VAR_CHANNEL || rettv.v_type == VAR_JOB)
{
emsg(_(e_inval_string));
p = NULL;
}
else
p = tv_get_string_buf(&rettv, buf);
}
else else
p = tv_stringify(&rettv, buf); p = tv_stringify(&rettv, buf);
if (p == NULL) if (p == NULL)

12
src/testdir/test_eval_stuff.vim
View File

@@ -216,3 +216,15 @@ func Test_scriptversion_fail()
call assert_fails('source Xversionscript', 'E999:') call assert_fails('source Xversionscript', 'E999:')
call delete('Xversionscript') call delete('Xversionscript')
endfunc endfunc
func Test_excute_null()
call assert_fails('execute test_null_list()', 'E730:')
call assert_fails('execute test_null_dict()', 'E731:')
call assert_fails('execute test_null_blob()', 'E976:')
execute test_null_string()
call assert_fails('execute test_null_partial()', 'E729:')
if has('job')
call assert_fails('execute test_null_job()', 'E908:')
call assert_fails('execute test_null_channel()', 'E908:')
endif
endfunc

2
src/version.c
View File

@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
104,
/**/ /**/
103, 103,
/**/ /**/