# HG changeset patch # User Bram Moolenaar # Date 1413370609 -7200 # Node ID f21a2f67bdbb7bb7c5c2352186757c3fd2471ce2 # Parent b77be7bf7cbed0569f414bbaf826bac1a125cd53 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. diff --git a/src/diff.c b/src/diff.c --- 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 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 477, +/**/ 476, /**/ 475,