mirror of
https://github.com/neovim/neovim.git
synced 2025-09-16 16:28:17 +00:00
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:
@@ -763,8 +763,8 @@ void ex_diffupdate(exarg_T *eap)
|
|||||||
// Make a difference between the first buffer and every other.
|
// Make a difference between the first buffer and every other.
|
||||||
for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new) {
|
for (idx_new = idx_orig + 1; idx_new < DB_COUNT; ++idx_new) {
|
||||||
buf_T *buf = curtab->tp_diffbuf[idx_new];
|
buf_T *buf = curtab->tp_diffbuf[idx_new];
|
||||||
if (buf == NULL) {
|
if (buf == NULL || buf->b_ml.ml_mfp == NULL) {
|
||||||
continue;
|
continue; // skip buffer that isn't loaded
|
||||||
}
|
}
|
||||||
|
|
||||||
if (diff_write(buf, tmp_new) == FAIL) {
|
if (diff_write(buf, tmp_new) == FAIL) {
|
||||||
|
@@ -478,7 +478,7 @@ static int included_patches[] = {
|
|||||||
813,
|
813,
|
||||||
// 812,
|
// 812,
|
||||||
// 811,
|
// 811,
|
||||||
// 810,
|
810,
|
||||||
809,
|
809,
|
||||||
// 808 NA
|
// 808 NA
|
||||||
807,
|
807,
|
||||||
|
Reference in New Issue
Block a user