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 98b791a72025c33a8e022f051288a53efed7028a..d324f99d8713c1501f94eb9eb0bf30df8238b01b 100644 (file)
--- 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 c4f560b07cd873af149579c6a3c977be36413bd4..d233c24e9aab73d7385f91188166d0f8833e7b34 100644 (file)
--- 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,
 /**/