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 86408a49448e6578f5a4c555294da541c04a6bfd..edc84a07aa2730518c8c41bc7b2cfaa5906419d1 100644 (file)
--- 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 20cafae10735cc7d4984b0a9795cc5c77b2b2cca..758c68635573725d86399251eb00bdbea1bd6622 100644 (file)
--- 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,
 /**/