patch 7.4.743
Problem: "p" in Visual mode causes an unexpected line split.
Solution: Advance the cursor first. (Yukihiro Nakadaira)
diff --git a/src/ops.c b/src/ops.c
index 05b1e1c..32461a8 100644
--- a/src/ops.c
+++ b/src/ops.c
@@ -3459,17 +3459,26 @@
{
if (flags & PUT_LINE_SPLIT)
{
+ char_u *p;
+
/* "p" or "P" in Visual mode: split the lines to put the text in
* between. */
if (u_save_cursor() == FAIL)
goto end;
- ptr = vim_strsave(ml_get_cursor());
+ p = ml_get_cursor();
+ if (dir == FORWARD && *p != NUL)
+ mb_ptr_adv(p);
+ ptr = vim_strsave(p);
if (ptr == NULL)
goto end;
ml_append(curwin->w_cursor.lnum, ptr, (colnr_T)0, FALSE);
vim_free(ptr);
- ptr = vim_strnsave(ml_get_curline(), curwin->w_cursor.col);
+ oldp = ml_get_curline();
+ p = oldp + curwin->w_cursor.col;
+ if (dir == FORWARD && *p != NUL)
+ mb_ptr_adv(p);
+ ptr = vim_strnsave(oldp, p - oldp);
if (ptr == NULL)
goto end;
ml_replace(curwin->w_cursor.lnum, ptr, FALSE);
diff --git a/src/testdir/test94.in b/src/testdir/test94.in
index e98d588..287d9dc 100644
--- a/src/testdir/test94.in
+++ b/src/testdir/test94.in
Binary files differ
diff --git a/src/testdir/test94.ok b/src/testdir/test94.ok
index 9207ea5..a1b0378 100644
--- a/src/testdir/test94.ok
+++ b/src/testdir/test94.ok
@@ -81,3 +81,34 @@
linewise select mode: delete last two line
a
---
+
+v_p: replace last character with line register at middle line
+aaa
+bb
+aaa
+
+ccc
+---
+
+v_p: replace last character with line register at middle line selecting newline
+aaa
+bb
+aaa
+ccc
+---
+
+v_p: replace last character with line register at last line
+aaa
+bbb
+cc
+aaa
+
+---
+
+v_p: replace last character with line register at last line selecting newline
+aaa
+bbb
+cc
+aaa
+
+---
diff --git a/src/version.c b/src/version.c
index 197b6ea..1dcdf71 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 743,
+/**/
742,
/**/
741,
