aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 7.4.743

Browse Source 
Problem:    "p" in Visual mode causes an unexpected line split.
Solution:   Advance the cursor first. (Yukihiro Nakadaira)
This commit is contained in:
Bram Moolenaar 2015-06-19 15:17:55 +02:00
parent a594d77ffc
commit c004bc2726
4 changed files with 80 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/ops.c
View File

@ -3459,17 +3459,26 @@ do_put(regname, dir, count, flags)
{
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);

36
src/testdir/test94.in
View File

@ -174,6 +174,42 @@ gH<Del>
:$put ='c'
kgH<Down><Del>
:$put ='---'
:
:$put =''
:$put ='v_p: replace last character with line register at middle line'
:$put ='aaa'
:$put ='bbb'
:$put ='ccc'
:-2yank
k$vp
:$put ='---'
:
:$put =''
:$put ='v_p: replace last character with line register at middle line selecting newline'
:$put ='aaa'
:$put ='bbb'
:$put ='ccc'
:-2yank
k$v$p
:$put ='---'
:
:$put =''
:$put ='v_p: replace last character with line register at last line'
:$put ='aaa'
:$put ='bbb'
:$put ='ccc'
:-2yank
$vp
:$put ='---'
:
:$put =''
:$put ='v_p: replace last character with line register at last line selecting newline'
:$put ='aaa'
:$put ='bbb'
:$put ='ccc'
:-2yank
$v$p
:$put ='---'
:/^start:/+2,$w! test.out
:q!
ENDTEST

31
src/testdir/test94.ok
View File

@ -81,3 +81,34 @@ b
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
---

2
src/version.c
View File

@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
743,
/**/
742,
/**/