patch 7.4.1015
Problem: The column is not restored properly when the matchparen plugin is
used in Insert mode and the cursor is after the end of the line.
Solution: Set the curswant flag. (Christian Brabandt). Also fix
highlighting the match of the character before the cursor.
diff --git a/src/eval.c b/src/eval.c
index 8b972df..1abb620 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -10183,6 +10183,7 @@
#ifdef FEAT_VIRTUALEDIT
long coladd = 0;
#endif
+ int set_curswant = TRUE;
rettv->vval.v_number = -1;
if (argvars[1].v_type == VAR_UNKNOWN)
@@ -10198,7 +10199,10 @@
coladd = pos.coladd;
#endif
if (curswant >= 0)
+ {
curwin->w_curswant = curswant - 1;
+ set_curswant = FALSE;
+ }
}
else
{
@@ -10231,7 +10235,7 @@
mb_adjust_cursor();
#endif
- curwin->w_set_curswant = TRUE;
+ curwin->w_set_curswant = set_curswant;
rettv->vval.v_number = 0;
}
@@ -17524,7 +17528,10 @@
{
curwin->w_cursor = pos;
if (curswant >= 0)
+ {
curwin->w_curswant = curswant - 1;
+ curwin->w_set_curswant = FALSE;
+ }
check_cursor();
rettv->vval.v_number = 0;
}
diff --git a/src/version.c b/src/version.c
index 699a7f6..1e9dabd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1015,
+/**/
1014,
/**/
1013,