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)

diff --git a/src/diff.c b/src/diff.c
index ef59e44376537953454a551e29fc495c18674236..03edb3ccab1d5b64eb3ee0eeaddb13b9f53cd563 100644 (file)
--- 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 ee2814f9740a53a3ad9ee90e867c95bab63b66d4..7ad08d2f48b2ddf9309d8f0932822505fab3740e 100644 (file)
--- 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,
 /**/