patch 7.4.747

Problem:    ":cnext" may jump to the wrong column when setting
            'virtualedit=all' (cs86661)
Solution:   Reset the coladd field. (Hirohito Higashi)

diff --git a/src/quickfix.c b/src/quickfix.c
index d4db0d253da8452f9a80d3e5ce5ae94911718e68..463056b56513c66399f6759a01100a949a830a71 100644 (file)
--- 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 ed442034164ffd81a0af76d95a6e8184a985d638..4505a3e898a86776200e014fbd82a2683837691e 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    747,
 /**/
     746,
 /**/