changeset 28960:8207581dd068 v8.2.5002

patch 8.2.5002: deletebufline() may change Visual selection Commit: https://github.com/vim/vim/commit/9b2edfd3bf2f14a1faaee9b62930598a2e77a798 Author: LemonBoy <thatlemon@gmail.com> Date: Sun May 22 15:35:53 2022 +0100 patch 8.2.5002: deletebufline() may change Visual selection Problem: deletebufline() may change Visual selection. Solution: Disable Visual mode when using another buffer. (closes https://github.com/vim/vim/issues/10469)
author Bram Moolenaar <Bram@vim.org>
date Sun, 22 May 2022 16:45:02 +0200
parents d79aa3eed38a
children 789ff659637a
files src/evalbuffer.c src/testdir/test_bufline.vim src/version.c
diffstat 3 files changed, 22 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/evalbuffer.c
+++ b/src/evalbuffer.c
@@ -510,6 +510,7 @@ f_deletebufline(typval_T *argvars, typva
     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, typva
 
     if (!is_curbuf)
     {
+	VIsual_active = FALSE;
 	curbuf_save = curbuf;
 	curwin_save = curwin;
 	curbuf = buf;
@@ -582,6 +584,7 @@ f_deletebufline(typval_T *argvars, typva
     {
 	curbuf = curbuf_save;
 	curwin = curwin_save;
+	VIsual_active = save_VIsual_active;
     }
     rettv->vval.v_number = 0; // OK
 }
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    5002,
+/**/
     5001,
 /**/
     5000,