patch 8.2.5002: deletebufline() may change Visual selection

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
index 13f813ebd8cf7142d1da9a831e0798c2b5c8fcb9..7de7271770bd2d4d5807b5d7333ac1b3cc62f65d 100644 (file)
--- 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
index d5b5d7ad848d0704f4bcbcea3dff1d08a2e9c3ad..5a062166de065815ca3458b98f346f9197ba6f9e 100644 (file)
--- 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
index d9471252396444ff1510e9548bbd22ccf39401af..6aef8ad539d8fe46451f06f4d4d37cd3b4455ce3 100644 (file)
--- 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,
 /**/