summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-10-15 12:56:49 +0200
committerBram Moolenaar <Bram@vim.org>2014-10-15 12:56:49 +0200
commite962c6795be76884f3683d93487fb59d3dae9b0a (patch)
treeec6ad032001f3cb44774b0212fe9fedc08a52e72
parentdcc1ce2f5a640df9aca9122ecf145a1e95257cf4 (diff)
downloadvim-git-e962c6795be76884f3683d93487fb59d3dae9b0a.tar.gz
updated for version 7.4.477v7.4.477
Problem: When using ":%diffput" and the other file is empty an extra empty line remains. Solution: Set the buf_empty flag.
-rw-r--r--src/diff.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
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
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 477,
+/**/
476,
/**/
475,