summaryrefslogtreecommitdiff
path: root/src/diff.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-10-31 13:54:25 +0100
committerBram Moolenaar <Bram@vim.org>2014-10-31 13:54:25 +0100
commit6a64365c952895ecc2219b303d9bf64dabf8f2e7 (patch)
tree24cdbbf8fd4c44e442c18f519ecb488dfee4f97e /src/diff.c
parentfe3c41009887331dc9fee2bedf457728117be544 (diff)
downloadvim-git-6a64365c952895ecc2219b303d9bf64dabf8f2e7.tar.gz
updated for version 7.4.490v7.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)
Diffstat (limited to 'src/diff.c')
-rw-r--r--src/diff.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/diff.c b/src/diff.c
index d324f99d8..caee6e5a5 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -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