diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-05-22 11:59:25 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-05-22 11:59:25 +0100 |
| commit | 0ad00a7fd3e0389f565876521e395c35144d8009 (patch) | |
| tree | 521ecf9cc1dd52b5d3f5703b1014cb06b33154f3 | |
| parent | dafef51b1cbe8aa836c4cfa52623f775bd85a190 (diff) | |
| download | vim-git-8.2.4996.tar.gz | |
patch 8.2.4996: setbufline() may change Visual selectionv8.2.4996
Problem: setbufline() may change Visual selection. (Qiming Zhao)
Solution: Disable Visual mode when using another buffer. (closes #10466)
| -rw-r--r-- | src/evalbuffer.c | 3 | ||||
| -rw-r--r-- | src/testdir/test_bufline.vim | 16 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 21 insertions, 0 deletions
diff --git a/src/evalbuffer.c b/src/evalbuffer.c index 1b829848f..13f813ebd 100644 --- 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 index 3acf7c96c..d5b5d7ad8 100644 --- 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\<C-G>", '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 index 1a39c0625..fdbb994a4 100644 --- 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, |