From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 19 Nov 2014 16:35:39 +0000 (+0100)
Subject: updated for version 7.4.521
X-Git-Tag: v7.4.521
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=06e7ce1a013535b11d5454630cc1770ef21ea461;p=vim

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)
---

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
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    521,
 /**/
     520,
 /**/