diff options
| author | Bram Moolenaar <Bram@vim.org> | 2014-03-19 18:57:54 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2014-03-19 18:57:54 +0100 |
| commit | 4c9a949d00468dde748653b269338ddfb30910cc (patch) | |
| tree | 8d1dae32187ebf4ff4ec9b651d06a4489e148ee4 | |
| parent | 529d2d63699bd43fde8c04fd0c84fd7b3e6bf20a (diff) | |
updated for version 7.4.210v7.4.210
Problem: Visual block mode plus virtual edit doesn't work well with tabs.
(Liang Li)
Solution: Take coladd into account. (Christian Brabandt)
| -rw-r--r-- | src/ops.c | 20 | ||||
| -rw-r--r-- | src/testdir/test39.in | 10 | ||||
| -rw-r--r-- | src/testdir/test39.ok | bin | 432 -> 481 bytes | |||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 30 insertions, 2 deletions
@@ -2646,7 +2646,15 @@ op_insert(oap, count1) if (oap->start.lnum == curbuf->b_op_start_orig.lnum && !bd.is_MAX) { if (oap->op_type == OP_INSERT - && oap->start.col != curbuf->b_op_start_orig.col) + && oap->start.col +#ifdef FEAT_VIRTUALEDIT + + oap->start.coladd +#endif + != curbuf->b_op_start_orig.col +#ifdef FEAT_VIRTUALEDIT + + curbuf->b_op_start_orig.coladd +#endif + ) { oap->start.col = curbuf->b_op_start_orig.col; pre_textlen -= getviscol2(oap->start.col, oap->start.coladd) @@ -2654,7 +2662,15 @@ op_insert(oap, count1) oap->start_vcol = getviscol2(oap->start.col, oap->start.coladd); } else if (oap->op_type == OP_APPEND - && oap->end.col >= curbuf->b_op_start_orig.col) + && oap->end.col +#ifdef FEAT_VIRTUALEDIT + + oap->end.coladd +#endif + >= curbuf->b_op_start_orig.col +#ifdef FEAT_VIRTUALEDIT + + curbuf->b_op_start_orig.coladd +#endif + ) { oap->start.col = curbuf->b_op_start_orig.col; /* reset pre_textlen to the value of OP_INSERT */ diff --git a/src/testdir/test39.in b/src/testdir/test39.in index 8f45f47dc3..c1e1cc49a6 100644 --- a/src/testdir/test39.in +++ b/src/testdir/test39.in @@ -35,6 +35,12 @@ G$khhhhhkkcmno /^C23$/ :exe ":norm! l\<C-V>j$hhAab\<Esc>" :.,/^$/w >> test.out +:" Test for Visual block insert when virtualedit=all +:set ve=all +:/\t\tline +:exe ":norm! 07l\<C-V>jjIx\<Esc>" +:set ve= +:.,/^$/w >> test.out :" gUe must uppercase a whole word, also when ß changes to SS Gothe youtußeuu endYpk0wgUe :" gUfx must uppercase until x, inclusive. @@ -62,6 +68,10 @@ G3o987652k02l2jr :qa! ENDTEST + line1 + line2 + line3 + aaaaaa bbbbbb cccccc diff --git a/src/testdir/test39.ok b/src/testdir/test39.ok Binary files differindex b459355c6a..ef7a2c6442 100644 --- a/src/testdir/test39.ok +++ b/src/testdir/test39.ok diff --git a/src/version.c b/src/version.c index 65fe16254f..3b1ccd9fd7 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 */ /**/ + 210, +/**/ 209, /**/ 208, |