diff options
| author | Jurica Bradaric <jbradaric@gmail.com> | 2016-02-02 18:52:35 +0100 |
|---|---|---|
| committer | Jurica Bradaric <jbradaric@gmail.com> | 2016-02-02 18:54:09 +0100 |
| commit | 2b2f9ccf8c5ace922f0e2682adabea8461b54ea5 (patch) | |
| tree | 832117931649fdc813d05c97905b79b0745be64b /src | |
| parent | cfce719c66b22f26e9f8def87c2b14d339208482 (diff) | |
| download | rneovim-2b2f9ccf8c5ace922f0e2682adabea8461b54ea5.tar.gz rneovim-2b2f9ccf8c5ace922f0e2682adabea8461b54ea5.tar.bz2 rneovim-2b2f9ccf8c5ace922f0e2682adabea8461b54ea5.zip | |
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)
https://github.com/vim/vim/commit/9dd33af4baf5fd7d3a7a779d8363834b38804946
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/diff.c | 4 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/nvim/diff.c b/src/nvim/diff.c index ce79158050..2776e45f5d 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -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) { diff --git a/src/nvim/version.c b/src/nvim/version.c index 88317fa8ee..e46de678c5 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -478,7 +478,7 @@ static int included_patches[] = { 813, // 812, // 811, - // 810, + 810, 809, // 808 NA 807, |