diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ops.c | 25 | ||||
| -rw-r--r-- | src/testdir/test39.in | 9 | ||||
| -rw-r--r-- | src/testdir/test39.ok | bin | 340 -> 377 bytes | |||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 36 insertions, 0 deletions
@@ -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. diff --git a/src/testdir/test39.in b/src/testdir/test39.in index 96995e089..77e2bd768 100644 --- 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 diff --git a/src/testdir/test39.ok b/src/testdir/test39.ok Binary files differindex 4ebecf6cd..4964d6a34 100644 --- a/src/testdir/test39.ok +++ b/src/testdir/test39.ok diff --git a/src/version.c b/src/version.c index f9bb7dd9f..af31b4752 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 85, +/**/ 84, /**/ 83, |