aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/diff.c
diff options
context:
space:
mode:
authorFlorian Walch <florian@fwalch.com>2014-12-23 12:22:43 +0100
committerFlorian Walch <florian@fwalch.com>2014-12-23 21:17:01 +0100
commit5b98a4338f47b76ff6aa66d7e5e9df38c65aa3aa (patch)
treecc44a9160ae07e71aab28acc0e37a65948905f6a /src/nvim/diff.c
parent0a20cd7f50c956044ebb204349491076e5424891 (diff)
downloadrneovim-5b98a4338f47b76ff6aa66d7e5e9df38c65aa3aa.tar.gz
rneovim-5b98a4338f47b76ff6aa66d7e5e9df38c65aa3aa.tar.bz2
rneovim-5b98a4338f47b76ff6aa66d7e5e9df38c65aa3aa.zip
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
Diffstat (limited to 'src/nvim/diff.c')
-rw-r--r--src/nvim/diff.c2
1 files changed, 1 insertions, 1 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) {