commit e962c6795be76884f3683d93487fb59d3dae9b0a
author Bram Moolenaar <Bram@vim.org> Wed Oct 15 12:56:49 2014 +0200
committer Bram Moolenaar <Bram@vim.org> Wed Oct 15 12:56:49 2014 +0200
tree ec6ad032001f3cb44774b0212fe9fedc08a52e72
parent dcc1ce2f5a640df9aca9122ecf145a1e95257cf4

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

diff --git a/src/diff.c b/src/diff.c
index 98b791a..d324f99 100644
--- a/src/diff.c
+++ b/src/diff.c
@@ -2325,7 +2325,7 @@
 		    end_skip = 0;
 	    }
 
-	    buf_empty = FALSE;
+	    buf_empty = bufempty();
 	    added = 0;
 	    for (i = 0; i < count; ++i)
 	    {

src/version.c

diff --git a/src/version.c b/src/version.c
index c4f560b..d233c24 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    477,
+/**/
     476,
 /**/
     475,