From e962c6795be76884f3683d93487fb59d3dae9b0a Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Wed, 15 Oct 2014 12:56:49 +0200 Subject: updated for version 7.4.477 Problem: When using ":%diffput" and the other file is empty an extra empty line remains. Solution: Set the buf_empty flag. --- src/diff.c | 2 +- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/diff.c b/src/diff.c index 98b791a720..d324f99d87 100644 --- a/src/diff.c +++ b/src/diff.c @@ -2325,7 +2325,7 @@ ex_diffgetput(eap) end_skip = 0; } - buf_empty = FALSE; + buf_empty = bufempty(); added = 0; for (i = 0; i < count; ++i) { diff --git a/src/version.c b/src/version.c index c4f560b07c..d233c24e9a 100644 --- a/src/version.c +++ b/src/version.c @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 477, /**/ 476, /**/ -- cgit v1.2.3