summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-11-21 13:24:41 +0100
committerBram Moolenaar <Bram@vim.org>2013-11-21 13:24:41 +0100
commit1e42f7ac1624058f8097bc8d6406af21b600b8f5 (patch)
tree84ce4a8ba83f311b62cb9d6929ddc9662a93eee3
parentffa2220950a8f2856f4d7042768888c27e51178a (diff)
downloadvim-git-1e42f7ac1624058f8097bc8d6406af21b600b8f5.tar.gz
updated for version 7.4.097v7.4.097
Problem: Unexpected behavior change related to 'virtualedit'. (Ingo Karkat) Solution: Update the valid cursor position. (Christian Brabandt)
-rw-r--r--src/ops.c4
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ops.c b/src/ops.c
index bf6519189..e1048c255 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -3844,7 +3844,11 @@ do_put(regname, dir, count, flags)
ml_replace(lnum, newp, FALSE);
/* Place cursor on last putted char. */
if (lnum == curwin->w_cursor.lnum)
+ {
+ /* make sure curwin->w_virtcol is updated */
+ changed_cline_bef_curs();
curwin->w_cursor.col += (colnr_T)(totlen - 1);
+ }
}
#ifdef FEAT_VISUAL
if (VIsual_active)
diff --git a/src/version.c b/src/version.c
index 89e6e1133..739b63e63 100644
--- a/src/version.c
+++ b/src/version.c
@@ -739,6 +739,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 97,
+/**/
96,
/**/
95,