summaryrefslogtreecommitdiff
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
commit5f24f1e5010640a5b410b4a63bce68dff07f48e4 (patch)
treea63213d1122d402b9943aea0036b98756d440134
parent53e7f64a17b83283f5b5125f201d09377e08bb48 (diff)
downloadvim-5f24f1e5010640a5b410b4a63bce68dff07f48e4.tar.gz
patch 7.4.747v7.4.747v7-4-747
Problem: ":cnext" may jump to the wrong column when setting 'virtualedit=all' (cs86661) Solution: Reset the coladd field. (Hirohito Higashi)
-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 d4db0d25..463056b5 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 ed442034..4505a3e8 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,