Mercurial > vim
changeset 31881:df061831a85f v9.0.1273
patch 9.0.1273: "1v" may select block with wrong size
Commit: https://github.com/vim/vim/commit/8f531662e28c37560bf5ac20a059bf00d01ee5a4
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Feb 1 17:33:18 2023 +0000
patch 9.0.1273: "1v" may select block with wrong size
Problem: "1v" may select block with wrong size. (Evgeni Chasnovski)
Solution: Compute "curswant" in the right line. (closes https://github.com/vim/vim/issues/11925)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Wed, 01 Feb 2023 18:45:04 +0100 |
| parents | 2902f885b9dc |
| children | 88ccc21894a4 |
| files | src/normal.c src/testdir/test_visual.vim src/version.c |
| diffstat | 3 files changed, 19 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/normal.c +++ b/src/normal.c @@ -5493,8 +5493,13 @@ nv_visual(cmdarg_T *cap) } else if (VIsual_mode == Ctrl_V) { + // Update curswant on the original line, that is where "col" is + // valid. + linenr_T lnum = curwin->w_cursor.lnum; + curwin->w_cursor.lnum = VIsual.lnum; update_curswant_force(); - curwin->w_curswant += + resel_VIsual_vcol * cap->count0 - 1; + curwin->w_curswant += resel_VIsual_vcol * cap->count0 - 1; + curwin->w_cursor.lnum = lnum; coladvance(curwin->w_curswant); } else
--- a/src/testdir/test_visual.vim +++ b/src/testdir/test_visual.vim @@ -1318,6 +1318,17 @@ func Test_visual_block_with_substitute() endfunc func Test_visual_reselect_with_count() + enew + call setline(1, ['aaaaaa', '✗ bbbb', '✗ bbbb']) + exe "normal! 2Gw\<C-V>jed" + exe "normal! gg0lP" + call assert_equal(['abbbbaaaaa', '✗bbbb ', '✗ '], getline(1, '$')) + + exe "normal! 1vr." + call assert_equal(['a....aaaaa', '✗.... ', '✗ '], getline(1, '$')) + + bwipe! + " this was causing an illegal memory access let lines =<< trim END