# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1675273504 -3600
# Node ID df061831a85f8354a88ff1f76c9db8d8c44fcc36
# Parent  2902f885b9dcf76671e449310379a61f4601ff1a
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)

diff --git a/src/normal.c b/src/normal.c
--- 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
--- 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
 
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1273,
+/**/
     1272,
 /**/
     1271,