thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.3.523

Browse Source 
Problem:    ":diffupdate" doesn't check for files changed elsewhere.
Solution:   Add the ! flag. (Christian Brabandt)
This commit is contained in:
Bram Moolenaar
2012-05-18 18:47:17 +02:00
parent 455981e69b
commit bd1d560895
4 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/diff.c
View File

@@ -783,6 +783,15 @@ ex_diffupdate(eap)
goto theend;
}
/* :diffupdate! */
if (eap != NULL && eap->forceit)
for (idx_new = idx_orig; idx_new < DB_COUNT; ++idx_new)
{
buf = curtab->tp_diffbuf[idx_new];
if (buf_valid(buf))
buf_check_timestamp(buf, FALSE);
}
/* Write the first buffer to a tempfile. */
buf = curtab->tp_diffbuf[idx_orig];
if (diff_write(buf, tmp_orig) == FAIL)