summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-06-19 18:35:34 +0200
committerBram Moolenaar <Bram@vim.org>2015-06-19 18:35:34 +0200
commitb8c890035efd694daab5cdd71b5265c52c23fa81 (patch)
tree67d81fd318aa4862843c1d397788326707fb9e31 /src
parent01cf376da1726862afc8fa1d84cf5a773909fd0d (diff)
patch 7.4.747v7.4.747
Problem: ":cnext" may jump to the wrong column when setting 'virtualedit=all' (cs86661) Solution: Reset the coladd field. (Hirohito Higashi)
Diffstat (limited to 'src')
-rw-r--r--src/quickfix.c3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/quickfix.c b/src/quickfix.c
index d4db0d253d..463056b565 100644
--- a/src/quickfix.c
+++ b/src/quickfix.c
@@ -1841,6 +1841,9 @@ win_found:
if (qf_ptr->qf_col > 0)
{
curwin->w_cursor.col = qf_ptr->qf_col - 1;
+#ifdef FEAT_VIRTUALEDIT
+ curwin->w_cursor.coladd = 0;
+#endif
if (qf_ptr->qf_viscol == TRUE)
{
/*
diff --git a/src/version.c b/src/version.c
index ed44203416..4505a3e898 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 747,
+/**/
746,
/**/
745,