Mercurial > vim
changeset 23596:9fa72351c18f v8.2.2340
patch 8.2.2340: win_execute() unexpectedly returns number zero when failing
Commit: https://github.com/vim/vim/commit/37487e16da7877129edee8d11b9b7f5c8df312c6
Author: Bram Moolenaar <Bram@vim.org>
Date: Tue Jan 12 22:08:53 2021 +0100
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 https://github.com/vim/vim/issues/7665)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Tue, 12 Jan 2021 22:15:03 +0100 |
| parents | d9942c46a490 |
| children | 000119fdb207 |
| files | src/evalwindow.c src/testdir/test_execute_func.vim src/testdir/test_vim9_builtin.vim src/version.c |
| diffstat | 4 files changed, 13 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/evalwindow.c +++ b/src/evalwindow.c @@ -673,6 +673,10 @@ f_win_execute(typval_T *argvars, typval_ 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;
--- 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})
--- 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})