Mercurial > vim
changeset 5471:70c3289803b3 v7.4.085
updated for version 7.4.085
Problem: When inserting text in Visual block mode and moving the cursor the
wrong text gets repeated in other lines.
Solution: Use the '[ mark to find the start of the actually inserted text.
(Christian Brabandt)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Mon, 11 Nov 2013 01:29:22 +0100 |
| parents | ef78f30093c6 |
| children | 3f4e943e122a |
| files | src/ops.c src/testdir/test39.in src/testdir/test39.ok src/version.c |
| diffstat | 4 files changed, 36 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ops.c +++ b/src/ops.c @@ -2640,6 +2640,31 @@ op_insert(oap, count1) { struct block_def bd2; + /* The user may have moved the cursor before inserting something, try + * to adjust the block for that. */ + if (oap->start.lnum == curbuf->b_op_start.lnum) + { + if (oap->op_type == OP_INSERT + && oap->start.col != curbuf->b_op_start.col) + { + oap->start.col = curbuf->b_op_start.col; + pre_textlen -= getviscol2(oap->start.col, oap->start.coladd) + - oap->start_vcol; + oap->start_vcol = getviscol2(oap->start.col, oap->start.coladd); + } + else if (oap->op_type == OP_APPEND + && oap->end.col >= curbuf->b_op_start.col) + { + oap->start.col = curbuf->b_op_start.col; + /* reset pre_textlen to the value of OP_INSERT */ + pre_textlen += bd.textlen; + pre_textlen -= getviscol2(oap->start.col, oap->start.coladd) + - oap->start_vcol; + oap->start_vcol = getviscol2(oap->start.col, oap->start.coladd); + oap->op_type = OP_INSERT; + } + } + /* * Spaces and tabs in the indent may have changed to other spaces and * tabs. Get the starting column again and correct the length.
--- a/src/testdir/test39.in +++ b/src/testdir/test39.in @@ -19,6 +19,10 @@ Gllllkkklllrq :" Test block-change G$khhhhhkkcmno :$-4,$w! test.out +:" Test block-insert using cursor keys for movement +/^aaaa/ +:exe ":norm! l\<C-V>jjjlllI\<Right>\<Right> \<Esc>" +:/^aa/,/^$/w >> test.out :" gUe must uppercase a whole word, also when ß changes to SS Gothe youtußeuu endYpk0wgUe :" gUfx must uppercase until x, inclusive. @@ -40,6 +44,11 @@ G3o987652k02l2jr :qa! ENDTEST +aaaaaa +bbbbbb +cccccc +dddddd + abcdefghijklm abcdefghijklm abcdefghijklm
index 4ebecf6cde60bfb4f90cf2960c4ffec2011efbda..4964d6a34b93691f1a8530296cb2a2994973317a GIT binary patch literal 377 zc$|feOA5k35JcVD;2r7$E|T$=rILVxn1vb8<s>tSzeEHB#>;vYJA?QmVlQ4#S5^0@ zOLdJCZPIMB-R%!KDHcv#0P^D4hOKYYq_qkBax-?V!l!HH;VT6&D2`)*K}nJT4ANQy z45IVKU>(XxE|-CnFomWrs*p!3tx9w$ng;KgVBwSFI1TD#KAys#ksorC5xK5g->;4z iDIvsj_h!n{e(JcQ*QepgYkYa5&Y=InfBBY8zIX?3HfK=)