From e649ef0fdd684ddf7dc2f2e1eeae56bb76390a3d Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 28 Jun 2007 20:18:51 +0000
Subject: [PATCH] updated for version 7.1-018

---
 src/ops.c     | 4 +++-
 src/version.c | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/ops.c b/src/ops.c
index ddc414b551..e8c69170f8 100644
--- 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 1bfc824468..42750d3238 100644
--- 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,
 /**/