updated for version 7.1-018

diff --git a/src/ops.c b/src/ops.c
index ddc414b55139eba4ba399010ab6f29d9d122715d..e8c69170f8bcc3972e964ffb5ea7bad9cb956917 100644 (file)
--- a/src/ops.c
+++ b/src/ops.c
@@ -3404,7 +3404,9 @@ do_put(regname, dir, count, flags)
 
 #ifdef FEAT_VIRTUALEDIT
        col += curwin->w_cursor.coladd;
-       if (ve_flags == VE_ALL && curwin->w_cursor.coladd > 0)
+       if (ve_flags == VE_ALL
+               && (curwin->w_cursor.coladd > 0
+                   || endcol2 == curwin->w_cursor.col))
        {
            if (dir == FORWARD && c == NUL)
                ++col;

diff --git a/src/version.c b/src/version.c
index 1bfc824468119a2aa624c7d9f49ad6266cb0a515..42750d32388cf95e17c4180e82ce1ab0eb05a36c 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 */
+/**/
+    18,
 /**/
     17,
 /**/