# HG changeset patch # User Bram Moolenaar # Date 1653217204 -7200 # Node ID b907d4a36318042afc6c5b7430fa8f8aeead1fd8 # Parent 159fdc9358130869505cf19a46b27a6be08ae77e patch 8.2.4996: setbufline() may change Visual selection Commit: https://github.com/vim/vim/commit/0ad00a7fd3e0389f565876521e395c35144d8009 Author: Bram Moolenaar Date: Sun May 22 11:59:25 2022 +0100 patch 8.2.4996: setbufline() may change Visual selection Problem: setbufline() may change Visual selection. (Qiming Zhao) Solution: Disable Visual mode when using another buffer. (closes https://github.com/vim/vim/issues/10466) diff --git a/src/evalbuffer.c b/src/evalbuffer.c --- a/src/evalbuffer.c +++ b/src/evalbuffer.c @@ -144,6 +144,7 @@ set_buffer_lines( buf_T *curbuf_save = NULL; win_T *curwin_save = NULL; int is_curbuf = buf == curbuf; + int save_VIsual_active = VIsual_active; // When using the current buffer ml_mfp will be set if needed. Useful when // setline() is used on startup. For other buffers the buffer must be @@ -158,6 +159,7 @@ set_buffer_lines( if (!is_curbuf) { + VIsual_active = FALSE; curbuf_save = curbuf; curwin_save = curwin; curbuf = buf; @@ -264,6 +266,7 @@ done: { curbuf = curbuf_save; curwin = curwin_save; + VIsual_active = save_VIsual_active; } } diff --git a/src/testdir/test_bufline.vim b/src/testdir/test_bufline.vim --- a/src/testdir/test_bufline.vim +++ b/src/testdir/test_bufline.vim @@ -222,4 +222,20 @@ func Test_appendbufline_redraw() call delete('XscriptMatchCommon') endfunc +func Test_setbufline_select_mode() + new + call setline(1, ['foo', 'bar']) + call feedkeys("j^v2l\", 'nx') + + let bufnr = bufadd('Xdummy') + call bufload(bufnr) + call setbufline(bufnr, 1, ['abc']) + + 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 --- 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 */ /**/ + 4996, +/**/ 4995, /**/ 4994,