updated for version 7.1-203

diff --git a/src/misc2.c b/src/misc2.c
index 7f39723de6c09dcd57c63e191af933bd1cefaba2..7cef2d38aff1dc5b20f73d7cf7897aff6e830a2e 100644 (file)
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -507,11 +507,16 @@ check_cursor_col()
        curwin->w_cursor.col = 0;
     else if (curwin->w_cursor.col >= len)
     {
-       /* Allow cursor past end-of-line in Insert mode, restarting Insert
-        * mode or when in Visual mode and 'selection' isn't "old" */
+       /* Allow cursor past end-of-line when:
+        * - in Insert mode or restarting Insert mode
+        * - in Visual mode and 'selection' isn't "old"
+        * - 'virtualedit' is set */
        if ((State & INSERT) || restart_edit
 #ifdef FEAT_VISUAL
                || (VIsual_active && *p_sel != 'o')
+#endif
+#ifdef FEAT_VIRTUALEDIT
+               || (ve_flags & VE_ONEMORE)
 #endif
                || virtual_active())
            curwin->w_cursor.col = len;

diff --git a/src/version.c b/src/version.c
index 864228eddd81425e3a3fe69b4bb792c6fea473cd..aa1091161d3a3cf3f0701a5e8418c88b3f1cb8ee 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    203,
 /**/
     202,
 /**/