From 2095148277cf1c4e7b3bbaf4e34812b7cfe3011b Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 25 Dec 2017 13:44:43 +0100 Subject: patch 8.0.1425: execute() does not work in completion of user command Problem: execute() does not work in completion of user command. (thinca) Solution: Switch off redir_off and restore it. (Ozaki Kiichi, closes #2492) --- src/evalfunc.c | 3 +++ src/testdir/test_usercommands.vim | 12 ++++++++++++ src/version.c | 2 ++ 3 files changed, 17 insertions(+) diff --git a/src/evalfunc.c b/src/evalfunc.c index 764a4db64..0300efea4 100644 --- a/src/evalfunc.c +++ b/src/evalfunc.c @@ -2886,6 +2886,7 @@ f_execute(typval_T *argvars, typval_T *rettv) int save_emsg_silent = emsg_silent; int save_emsg_noredir = emsg_noredir; int save_redir_execute = redir_execute; + int save_redir_off = redir_off; garray_T save_ga; rettv->vval.v_string = NULL; @@ -2928,6 +2929,7 @@ f_execute(typval_T *argvars, typval_T *rettv) save_ga = redir_execute_ga; ga_init2(&redir_execute_ga, (int)sizeof(char), 500); redir_execute = TRUE; + redir_off = FALSE; if (cmd != NULL) do_cmdline_cmd(cmd); @@ -2958,6 +2960,7 @@ f_execute(typval_T *argvars, typval_T *rettv) redir_execute = save_redir_execute; if (redir_execute) redir_execute_ga = save_ga; + redir_off = save_redir_off; /* "silent reg" or "silent echo x" leaves msg_col somewhere in the * line. Put it back in the first column. */ diff --git a/src/testdir/test_usercommands.vim b/src/testdir/test_usercommands.vim index 9420321ac..21b1c4c0f 100644 --- a/src/testdir/test_usercommands.vim +++ b/src/testdir/test_usercommands.vim @@ -206,3 +206,15 @@ func Test_CmdCompletion() com! -complete=customlist,CustomComp DoCmd : call assert_fails("call feedkeys(':DoCmd \', 'tx')", 'E117:') endfunc + +func CallExecute(A, L, P) + " Drop first '\n' + return execute('echo "hi"')[1:] +endfunc + +func Test_use_execute_in_completion() + command! -nargs=* -complete=custom,CallExecute DoExec : + call feedkeys(":DoExec \\\"\", 'tx') + call assert_equal('"DoExec hi', @:) + delcommand DoExec +endfunc diff --git a/src/version.c b/src/version.c index 4f8dfd29c..f62287b5b 100644 --- a/src/version.c +++ b/src/version.c @@ -771,6 +771,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1425, /**/ 1424, /**/ -- cgit v1.2.1