summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-11-19 17:35:39 +0100
committerBram Moolenaar <Bram@vim.org>2014-11-19 17:35:39 +0100
commit06e7ce1a013535b11d5454630cc1770ef21ea461 (patch)
tree5a3446529d0cb1442c775b9132eae36c8d425016 /src
parent57bc4633b24be82697d969c865bb018cfa47099f (diff)
downloadvim-06e7ce1a013535b11d5454630cc1770ef21ea461.zip
updated for version 7.4.521
Problem: When using "vep" a mark is moved to the next line. (Maxi Padulo, Issue 283) Solution: Decrement the line number. (Christian Brabandt)
Diffstat (limited to 'src')
-rw-r--r--src/ops.c3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/ops.c b/src/ops.c
index 86408a494..edc84a07a 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -3831,6 +3831,9 @@ do_put(regname, dir, count, flags)
lnum++;
} while (VIsual_active && lnum <= curbuf->b_visual.vi_end.lnum);
+ if (VIsual_active) /* reset lnum to the last visual line */
+ lnum--;
+
curbuf->b_op_end = curwin->w_cursor;
/* For "CTRL-O p" in Insert mode, put cursor after last char */
if (totlen && (restart_edit != 0 || (flags & PUT_CURSEND)))
diff --git a/src/version.c b/src/version.c
index 20cafae10..758c68635 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 521,
+/**/
520,
/**/
519,