1
0
forked from aniani/vim

updated for version 7.4.490

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

View File

@@ -2107,12 +2107,20 @@ diff_infold(wp, lnum)
* "dp" and "do" commands.
*/
void
nv_diffgetput(put)
nv_diffgetput(put, count)
int put;
long count;
{
exarg_T ea;
char_u buf[30];
ea.arg = (char_u *)"";
if (count == 0)
ea.arg = (char_u *)"";
else
{
vim_snprintf((char *)buf, 30, "%ld", count);
ea.arg = buf;
}
if (put)
ea.cmdidx = CMD_diffput;
else