changeset 26994:8d9506f3542e v8.2.4026

patch 8.2.4026: ml_get error with specific win_execute() command Commit: https://github.com/vim/vim/commit/e664a327014f4aa8baf8549a34a4caab2f3116a3 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Jan 7 14:08:03 2022 +0000 patch 8.2.4026: ml_get error with specific win_execute() command Problem: ml_get error with specific win_execute() command. (Sean Dewar) Solution: Check cursor and Visual area are OK.
author Bram Moolenaar <Bram@vim.org>
date Fri, 07 Jan 2022 15:15:03 +0100
parents 9a8859c832f0
children b36d27260f1d
files src/evalwindow.c src/testdir/test_execute_func.vim src/version.c
diffstat 3 files changed, 23 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/evalwindow.c
+++ b/src/evalwindow.c
@@ -743,6 +743,12 @@ f_win_execute(typval_T *argvars, typval_
 	// Update the status line if the cursor moved.
 	if (win_valid(wp) && !EQUAL_POS(curpos, wp->w_cursor))
 	    wp->w_redr_status = TRUE;
+
+	// In case the command moved the cursor or changed the Visual area,
+	// check it is valid.
+	check_cursor();
+	if (VIsual_active)
+	    check_pos(curbuf, &VIsual);
     }
 }
 
--- a/src/testdir/test_execute_func.vim
+++ b/src/testdir/test_execute_func.vim
@@ -153,8 +153,23 @@ func Test_win_execute_visual_redraw()
   call setline(1, ['a', 'b', 'c'])
   new
   wincmd p
+  " start Visual in current window, redraw in other window with fewer lines
   call feedkeys("G\<C-V>", 'txn')
   call win_execute(winnr('#')->win_getid(), 'redraw')
+  call feedkeys("\<Esc>", 'txn')
+  bwipe!
+  bwipe!
+
+  enew
+  new
+  call setline(1, ['a', 'b', 'c'])
+  let winid = win_getid()
+  wincmd p
+  " start Visual in current window, extend it in other window with more lines
+  call feedkeys("\<C-V>", 'txn')
+  call win_execute(winid, 'call feedkeys("G\<C-V>", ''txn'')')
+  redraw
+
   bwipe!
   bwipe!
 endfunc
--- 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 */
 /**/
+    4026,
+/**/
     4025,
 /**/
     4024,