From 9dd33af4baf5fd7d3a7a779d8363834b38804946 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Tue, 4 Aug 2015 21:51:25 +0200 Subject: [PATCH] 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) --- src/diff.c | 4 ++-- src/version.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/diff.c b/src/diff.c index ef59e4437..03edb3cca 100644 --- a/src/diff.c +++ b/src/diff.c @@ -804,8 +804,8 @@ ex_diffupdate(eap) for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new) { 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) continue; diff_file(tmp_orig, tmp_new, tmp_diff); diff --git a/src/version.c b/src/version.c index ee2814f97..7ad08d2f4 100644 --- a/src/version.c +++ b/src/version.c @@ -741,6 +741,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 810, /**/ 809, /**/ -- 2.50.1