Mercurial > vim

changeset 6286:f21a2f67bdbb v7.4.477

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Bram Moolenaar <bram@vim.org>
date Wed, 15 Oct 2014 12:56:49 +0200
parents b77be7bf7cbe
children 7f7353f0c7ac
files src/diff.c src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)
 	    {
--- 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,