updated for version 7.4.210
Problem: Visual block mode plus virtual edit doesn't work well with tabs.
(Liang Li)
Solution: Take coladd into account. (Christian Brabandt)
diff --git a/src/ops.c b/src/ops.c
index 4517e42..cd1f29e 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -2646,7 +2646,15 @@
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 @@
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 8f45f47..c1e1cc4 100644
--- a/src/testdir/test39.in
+++ b/src/testdir/test39.in
Binary files differ
diff --git a/src/testdir/test39.ok b/src/testdir/test39.ok
index b459355..ef7a2c6 100644
--- a/src/testdir/test39.ok
+++ b/src/testdir/test39.ok
Binary files differ
diff --git a/src/version.c b/src/version.c
index 65fe162..3b1ccd9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 210,
+/**/
209,
/**/
208,