# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1610486103 -3600
# Node ID 9fa72351c18ff5f2b69f2ef3d882553a0ff3e611
# Parent  d9942c46a490d8d41e38f6d481a0c12114db4ba4
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)

diff --git a/src/evalwindow.c b/src/evalwindow.c
--- 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;
diff --git a/src/testdir/test_execute_func.vim b/src/testdir/test_execute_func.vim
--- 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
--- 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
--- 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,