updated for version 7.4.186
Problem: Insert in Visual mode sometimes gives incorrect results.
(Dominique Pelle)
Solution: Remember the original insert start position. (Christian Brabandt,
Dominique Pelle)
diff --git a/src/edit.c b/src/edit.c
index 29d8d3e..57bd776 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -264,6 +264,7 @@
static colnr_T Insstart_textlen; /* length of line when insert started */
static colnr_T Insstart_blank_vcol; /* vcol for first inserted blank */
+static int update_Insstart_orig = TRUE; /* set Insstart_orig to Insstart */
static char_u *last_insert = NULL; /* the text of the previous insert,
K_SPECIAL and CSI are escaped */
@@ -340,6 +341,9 @@
* error message */
check_for_delay(TRUE);
+ /* set Insstart_orig to Insstart */
+ update_Insstart_orig = TRUE;
+
#ifdef HAVE_SANDBOX
/* Don't allow inserting in the sandbox. */
if (sandbox != 0)
@@ -631,6 +635,9 @@
if (arrow_used) /* don't repeat insert when arrow key used */
count = 0;
+ if (update_Insstart_orig)
+ Insstart_orig = Insstart;
+
if (stop_insert_mode)
{
/* ":stopinsert" used or 'insertmode' reset */
@@ -6923,6 +6930,7 @@
if (end_insert_pos != NULL)
{
curbuf->b_op_start = Insstart;
+ curbuf->b_op_start_orig = Insstart_orig;
curbuf->b_op_end = *end_insert_pos;
}
}
@@ -8257,6 +8265,7 @@
/* Need to reset Insstart, esp. because a BS that joins
* a line to the previous one must save for undo. */
+ update_Insstart_orig = FALSE;
Insstart = curwin->w_cursor;
break;
diff --git a/src/globals.h b/src/globals.h
index f729154..fd4e70c 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -752,6 +752,12 @@
*/
EXTERN pos_T Insstart; /* This is where the latest
* insert/append mode started. */
+
+/* This is where the latest insert/append mode started. In contrast to
+ * Insstart, this won't be reset by certain keys and is needed for
+ * op_insert(), to detect correctly where inserting by the user started. */
+EXTERN pos_T Insstart_orig;
+
#ifdef FEAT_VREPLACE
/*
* Stuff for VREPLACE mode.
diff --git a/src/ops.c b/src/ops.c
index 8505f64..4517e42 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -2643,20 +2643,20 @@
/* 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 && !bd.is_MAX)
+ 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.col)
+ && oap->start.col != curbuf->b_op_start_orig.col)
{
- oap->start.col = curbuf->b_op_start.col;
+ oap->start.col = curbuf->b_op_start_orig.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->end.col >= curbuf->b_op_start_orig.col)
{
- oap->start.col = curbuf->b_op_start.col;
+ oap->start.col = curbuf->b_op_start_orig.col;
/* reset pre_textlen to the value of OP_INSERT */
pre_textlen += bd.textlen;
pre_textlen -= getviscol2(oap->start.col, oap->start.coladd)
diff --git a/src/structs.h b/src/structs.h
index c3f0312..5de3a68 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -1449,6 +1449,7 @@
* start and end of an operator, also used for '[ and ']
*/
pos_T b_op_start;
+ pos_T b_op_start_orig; /* used for Insstart_orig */
pos_T b_op_end;
#ifdef FEAT_VIMINFO
diff --git a/src/version.c b/src/version.c
index 221df42..8dcd656 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 186,
+/**/
185,
/**/
184,