1
0
forked from aniani/vim

patch 8.2.2340: win_execute() unexpectedly returns number zero when failing

Problem:    win_execute() unexpectedly returns number zero when failing.
Solution:   Return an empty string. (closes #7665)
This commit is contained in:
Bram Moolenaar
2021-01-12 22:08:53 +01:00
parent a47e05f04a
commit 37487e16da
4 changed files with 13 additions and 0 deletions

View File

@@ -673,6 +673,10 @@ f_win_execute(typval_T *argvars, typval_T *rettv)
win_T *save_curwin;
tabpage_T *save_curtab;
// Return an empty string if something fails.
rettv->v_type = VAR_STRING;
rettv->vval.v_string = NULL;
if (wp != NULL && tp != NULL)
{
pos_T curpos = wp->w_cursor;

View File

@@ -89,6 +89,8 @@ func Test_win_execute()
call win_gotoid(thiswin)
let line = win_execute(otherwin, 'echo getline(1)')
call assert_match('the new window', line)
let line = win_execute(134343, 'echo getline(1)')
call assert_equal('', line)
if has('popupwin')
let popupwin = popup_create('the popup win', {'line': 2, 'col': 3})

View File

@@ -800,6 +800,11 @@ def Test_timer_paused()
timer_stop(id)
enddef
def Test_win_execute()
assert_equal("\n" .. winnr(), win_execute(win_getid(), 'echo winnr()'))
assert_equal('', win_execute(342343, 'echo winnr()'))
enddef
def Test_win_splitmove()
split
win_splitmove(1, 2, {vertical: true, rightbelow: true})

View File

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