From 6a64365c952895ecc2219b303d9bf64dabf8f2e7 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Fri, 31 Oct 2014 13:54:25 +0100 Subject: 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) --- src/diff.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'src/diff.c') 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 -- cgit v1.2.1