From 8f531662e28c37560bf5ac20a059bf00d01ee5a4 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 1 Feb 2023 17:33:18 +0000 Subject: 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 #11925) --- src/normal.c | 7 ++++++- src/testdir/test_visual.vim | 11 +++++++++++ src/version.c | 2 ++ 3 files changed, 19 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/normal.c b/src/normal.c index 0bd6655f2d..9a3006705c 100644 --- 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 diff --git a/src/testdir/test_visual.vim b/src/testdir/test_visual.vim index a56c28854f..295e16f93d 100644 --- 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\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 diff --git a/src/version.c b/src/version.c index dc3fad59d2..ff2105c87a 100644 --- a/src/version.c +++ b/src/version.c @@ -695,6 +695,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1273, /**/ 1272, /**/ -- cgit v1.2.3