diff options
author | Bram Moolenaar <Bram@vim.org> | 2013-11-11 01:29:22 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2013-11-11 01:29:22 +0100 |
commit | 3f75e422be7dba58a6c6fc58dcc51b882bd4adaf (patch) | |
tree | f0f126c4e6ed50f7503be5808304c9cbf06d4a18 /src/ops.c | |
parent | d6b8a5253b293b90a90af4320e9fd1c6e587ad2b (diff) | |
download | vim-git-3f75e422be7dba58a6c6fc58dcc51b882bd4adaf.tar.gz |
updated for version 7.4.085v7.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)
Diffstat (limited to 'src/ops.c')
-rw-r--r-- | src/ops.c | 25 |
1 files changed, 25 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. |