aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 7.4.810

Browse Source 
Problem:    With a sequence of commands using buffers in diff mode E749 is
            given. (itchyny)
Solution:   Skip unloaded buffer. (Hirohito Higashi)
This commit is contained in:
Bram Moolenaar
2015-08-04 21:51:25 +02:00
parent 75e6413546
commit 9dd33af4ba
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/diff.c
View File

@@ -804,8 +804,8 @@ ex_diffupdate(eap)
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 = curtab->tp_diffbuf[idx_new]; 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)
continue; continue;
diff_file(tmp_orig, tmp_new, tmp_diff); diff_file(tmp_orig, tmp_new, tmp_diff);

2
src/version.c
View File

@@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
810,
/**/ /**/
809, 809,
/**/ /**/