summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2007-06-28 20:18:51 +0000
committerBram Moolenaar <Bram@vim.org>2007-06-28 20:18:51 +0000
commite649ef0fdd684ddf7dc2f2e1eeae56bb76390a3d (patch)
tree98355c814f0fa4c755b851c1c8eaf624256998be
parent5386a123f5038d397848cc0183eda93c7c8b9d95 (diff)
downloadvim-git-e649ef0fdd684ddf7dc2f2e1eeae56bb76390a3d.tar.gz
updated for version 7.1-018v7.1.018
-rw-r--r--src/ops.c4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ops.c b/src/ops.c
index ddc414b55..e8c69170f 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 1bfc82446..42750d323 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 18,
+/**/
17,
/**/
16,