diff options
author | Bram Moolenaar <Bram@vim.org> | 2018-09-16 14:10:31 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2018-09-16 14:10:31 +0200 |
commit | e3521d9cbb786806eaff106707851d37d2c0ecef (patch) | |
tree | 37457955339b93a9bd1410491b2a1f1e9bea2b72 /src/misc1.c | |
parent | 785fc6567f572b8caefbc89ec29bbd8b801464ae (diff) |
patch 8.1.0394: diffs are not always updated correctlyv8.1.0394
Problem: Diffs are not always updated correctly.
Solution: When using internal diff update for any changes properly.
Diffstat (limited to 'src/misc1.c')
-rw-r--r-- | src/misc1.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/misc1.c b/src/misc1.c index f9055e6e35..28e44da1cc 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -3093,7 +3093,7 @@ changed_lines( changed_lines_buf(curbuf, lnum, lnume, xtra); #ifdef FEAT_DIFF - if (xtra == 0 && curwin->w_p_diff) + if (xtra == 0 && curwin->w_p_diff && !diff_internal()) { /* When the number of lines doesn't change then mark_adjust() isn't * called and other diff buffers still need to be marked for @@ -3173,6 +3173,11 @@ changed_common( /* mark the buffer as modified */ changed(); +#ifdef FEAT_DIFF + if (curwin->w_p_diff && diff_internal()) + curtab->tp_diff_update = TRUE; +#endif + /* set the '. mark */ if (!cmdmod.keepjumps) { |