patch 8.2.5002: deletebufline() may change Visual selection

LemonBoy · brammool · commit 9b2edfd3bf2f · 2022-05-22T15:35:53.000+01:00
Problem:    deletebufline() may change Visual selection.
Solution:   Disable Visual mode when using another buffer. (closes #10469)
diff --git a/src/evalbuffer.c b/src/evalbuffer.c
@@ -510,6 +510,7 @@ f_deletebufline(typval_T *argvars, typval_T *rettv)
     tabpage_T	*tp;
     win_T	*wp;
     int		did_emsg_before = did_emsg;
+    int		save_VIsual_active = VIsual_active;
 
     rettv->vval.v_number = 1;	// FAIL by default
 
@@ -538,6 +539,7 @@ f_deletebufline(typval_T *argvars, typval_T *rettv)
 
     if (!is_curbuf)
     {
+	VIsual_active = FALSE;
 	curbuf_save = curbuf;
 	curwin_save = curwin;
 	curbuf = buf;
@@ -582,6 +584,7 @@ f_deletebufline(typval_T *argvars, typval_T *rettv)
     {
 	curbuf = curbuf_save;
 	curwin = curwin_save;
+	VIsual_active = save_VIsual_active;
     }
     rettv->vval.v_number = 0; // OK
 }
diff --git a/src/testdir/test_bufline.vim b/src/testdir/test_bufline.vim
@@ -238,4 +238,21 @@ func Test_setbufline_select_mode()
   bwipe!
 endfunc
 
+func Test_deletebufline_select_mode()
+  new
+  call setline(1, ['foo', 'bar'])
+  call feedkeys("j^v2l\<C-G>", 'nx')
+
+  let bufnr = bufadd('Xdummy')
+  call bufload(bufnr)
+  call setbufline(bufnr, 1, ['abc', 'def'])
+  call deletebufline(bufnr, 1)
+
+  call feedkeys("x", 'nx')
+  call assert_equal(['foo', 'x'], getline(1, 2))
+
+  exe "bwipe! " .. bufnr
+  bwipe!
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/version.c b/src/version.c
@@ -734,6 +734,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    5002,
 /**/
     5001,
 /**/

Original file line number	Diff line number	Diff line change
`@@ -510,6 +510,7 @@ f_deletebufline(typval_T argvars, typval_T rettv)`
`510`	`510`	`tabpage_T *tp;`
`511`	`511`	`win_T *wp;`
`512`	`512`	`int did_emsg_before = did_emsg;`
	`513`	`+ int save_VIsual_active = VIsual_active;`
`513`	`514`
`514`	`515`	`rettv->vval.v_number = 1; // FAIL by default`
`515`	`516`
`@@ -538,6 +539,7 @@ f_deletebufline(typval_T argvars, typval_T rettv)`
`538`	`539`
`539`	`540`	`if (!is_curbuf)`
`540`	`541`	`{`
	`542`	`+ VIsual_active = FALSE;`
`541`	`543`	`curbuf_save = curbuf;`
`542`	`544`	`curwin_save = curwin;`
`543`	`545`	`curbuf = buf;`
`@@ -582,6 +584,7 @@ f_deletebufline(typval_T argvars, typval_T rettv)`
`582`	`584`	`{`
`583`	`585`	`curbuf = curbuf_save;`
`584`	`586`	`curwin = curwin_save;`
	`587`	`+ VIsual_active = save_VIsual_active;`
`585`	`588`	`}`
`586`	`589`	`rettv->vval.v_number = 0; // OK`
`587`	`590`	`}`