diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-01-12 22:08:53 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-01-12 22:08:53 +0100 |
| commit | 37487e16da7877129edee8d11b9b7f5c8df312c6 (patch) | |
| tree | 0363a52316b5f9bfc366235c6006324ac57599b8 | |
| parent | a47e05f04a5a5c0369c949157c24d09cbe64ad6a (diff) | |
| download | vim-git-37487e16da7877129edee8d11b9b7f5c8df312c6.tar.gz | |
patch 8.2.2340: win_execute() unexpectedly returns number zero when failingv8.2.2340
Problem: win_execute() unexpectedly returns number zero when failing.
Solution: Return an empty string. (closes #7665)
| -rw-r--r-- | src/evalwindow.c | 4 | ||||
| -rw-r--r-- | src/testdir/test_execute_func.vim | 2 | ||||
| -rw-r--r-- | src/testdir/test_vim9_builtin.vim | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 13 insertions, 0 deletions
diff --git a/src/evalwindow.c b/src/evalwindow.c index 492269ede..e00747a2d 100644 --- a/src/evalwindow.c +++ b/src/evalwindow.c @@ -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; diff --git a/src/testdir/test_execute_func.vim b/src/testdir/test_execute_func.vim index e02b08eb4..036371715 100644 --- a/src/testdir/test_execute_func.vim +++ b/src/testdir/test_execute_func.vim @@ -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}) diff --git a/src/testdir/test_vim9_builtin.vim b/src/testdir/test_vim9_builtin.vim index a84b7f621..40cfdcbb1 100644 --- a/src/testdir/test_vim9_builtin.vim +++ b/src/testdir/test_vim9_builtin.vim @@ -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}) diff --git a/src/version.c b/src/version.c index fe41ec27a..24462a0e6 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2340, +/**/ 2339, /**/ 2338, |