vim-patch:7.4.810

Problem:    With a sequence of commands using buffers in diff mode E749 is
            given. (itchyny)
Solution:   Skip unloaded buffer. (Hirohito Higashi)

9dd33af4ba
This commit is contained in:
Jurica Bradaric 2016-02-02 18:52:35 +01:00
parent cfce719c66
commit 2b2f9ccf8c
2 changed files with 3 additions and 3 deletions

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) {

View File

@ -478,7 +478,7 @@ static int included_patches[] = {
813,
// 812,
// 811,
// 810,
810,
809,
// 808 NA
807,