From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 15 Oct 2014 10:56:49 +0000 (+0200)
Subject: updated for version 7.4.477
X-Git-Tag: v7.4.477
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e962c6795be76884f3683d93487fb59d3dae9b0a;p=vim

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
index 98b791a72..d324f99d8 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 c4f560b07..d233c24e9 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,
 /**/