thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.4.490

Browse Source 
Problem:    Cannot specify the buffer to use for "do" and "dp", making them
            useless for three-way diff.
Solution:   Use the count as the buffer number. (James McCoy)
This commit is contained in:
Bram Moolenaar
2014-10-31 13:54:25 +01:00
parent fe3c410098
commit 6a64365c95
4 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/normal.c
View File

@@ -9284,7 +9284,7 @@ nv_put(cap)
if (cap->oap->op_type == OP_DELETE && cap->cmdchar == 'p')
{
clearop(cap->oap);
nv_diffgetput(TRUE);
nv_diffgetput(TRUE, cap->opcount);
}
else
#endif
@@ -9407,7 +9407,7 @@ nv_open(cap)
if (cap->oap->op_type == OP_DELETE && cap->cmdchar == 'o')
{
clearop(cap->oap);
nv_diffgetput(FALSE);
nv_diffgetput(FALSE, cap->opcount);
}
else
#endif