diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-05-23 06:54:27 +0800 |
|---|---|---|
| committer | zeertzjq <zeertzjq@outlook.com> | 2022-05-23 06:57:30 +0800 |
| commit | bcfc97e8d85df38ce7bea16c02cf8f89c9c96cdc (patch) | |
| tree | af9880f8cc58a210e34a30dee88288d71a8f38ea | |
| parent | eae4eddc54add4cbf16131edee28acf9ab53cdbb (diff) | |
| download | rneovim-bcfc97e8d85df38ce7bea16c02cf8f89c9c96cdc.tar.gz rneovim-bcfc97e8d85df38ce7bea16c02cf8f89c9c96cdc.tar.bz2 rneovim-bcfc97e8d85df38ce7bea16c02cf8f89c9c96cdc.zip | |
vim-patch:8.2.5002: deletebufline() may change Visual selection
Problem: deletebufline() may change Visual selection.
Solution: Disable Visual mode when using another buffer. (closes vim/vim#10469)
https://github.com/vim/vim/commit/9b2edfd3bf2f14a1faaee9b62930598a2e77a798
| -rw-r--r-- | src/nvim/eval/funcs.c | 3 | ||||
| -rw-r--r-- | src/nvim/testdir/test_bufline.vim | 17 |
2 files changed, 20 insertions, 0 deletions
diff --git a/src/nvim/eval/funcs.c b/src/nvim/eval/funcs.c index 6fa5aac2d6..59c290a5b1 100644 --- a/src/nvim/eval/funcs.c +++ b/src/nvim/eval/funcs.c @@ -1636,6 +1636,7 @@ static void f_deletebufline(typval_T *argvars, typval_T *rettv, FunPtr fptr) return; } const bool is_curbuf = buf == curbuf; + const bool save_VIsual_active = VIsual_active; const linenr_T first = tv_get_lnum_buf(&argvars[1], buf); if (argvars[2].v_type != VAR_UNKNOWN) { @@ -1651,6 +1652,7 @@ static void f_deletebufline(typval_T *argvars, typval_T *rettv, FunPtr fptr) } if (!is_curbuf) { + VIsual_active = false; curbuf_save = curbuf; curwin_save = curwin; curbuf = buf; @@ -1694,6 +1696,7 @@ static void f_deletebufline(typval_T *argvars, typval_T *rettv, FunPtr fptr) if (!is_curbuf) { curbuf = curbuf_save; curwin = curwin_save; + VIsual_active = save_VIsual_active; } } diff --git a/src/nvim/testdir/test_bufline.vim b/src/nvim/testdir/test_bufline.vim index e9f508bca1..ffb8e3facd 100644 --- a/src/nvim/testdir/test_bufline.vim +++ b/src/nvim/testdir/test_bufline.vim @@ -170,4 +170,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 |