From 5b98a4338f47b76ff6aa66d7e5e9df38c65aa3aa Mon Sep 17 00:00:00 2001
From: Florian Walch <florian@fwalch.com>
Date: Tue, 23 Dec 2014 12:22:43 +0100
Subject: [PATCH] vim-patch:7.4.477

Problem:    When using ":%diffput" and the other file is empty an extra empty
	    line remains.
Solution:   Set the buf_empty flag.

https://code.google.com/p/vim/source/detail?r=v7-4-477
---
 src/nvim/diff.c    | 2 +-
 src/nvim/version.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nvim/diff.c b/src/nvim/diff.c
index 3151daf826..7e31c3f216 100644
--- a/src/nvim/diff.c
+++ b/src/nvim/diff.c
@@ -2237,7 +2237,7 @@ void ex_diffgetput(exarg_T *eap)
         }
       }
 
-      buf_empty = FALSE;
+      buf_empty = bufempty();
       added = 0;
 
       for (i = 0; i < count; ++i) {
diff --git a/src/nvim/version.c b/src/nvim/version.c
index c4529265cc..ea4dfd1ce0 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -261,7 +261,7 @@ static int included_patches[] = {
   //480 NA
   //479 NA
   478,
-  //477,
+  477,
   //476 NA
   //475 NA
   //474,