mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-18 09:18:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge #4152 'vim-patch:7.4.{798,800,805,810,811,814,815,816,817,820,825}'.

Browse Source
This commit is contained in:
Justin M. Keyes
2016-02-09 01:58:54 -05:00
parent 17ae27190d 52692d3cd3
commit b9701c2a2b
10 changed files with 77 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nvim/diff.c
View File

@@ -763,8 +763,8 @@ void ex_diffupdate(exarg_T *eap)
// Make a difference between the first buffer and every other.
for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new) {
buf_T *buf = curtab->tp_diffbuf[idx_new];
if (buf == NULL) {
continue;
if (buf == NULL || buf->b_ml.ml_mfp == NULL) {
continue; // skip buffer that isn't loaded
}
if (diff_write(buf, tmp_new) == FAIL) {