diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-09-12 18:00:12 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-09-12 18:00:12 +0200 |
| commit | 274cea35c6d409cfb16862ff24e789b2d3ea3ee3 (patch) | |
| tree | 10455d79ab477a8c61a51a6116b0f0077aba2806 | |
| parent | 67f8ab829911c7901c534ef2bf19cc34b622936f (diff) | |
| download | vim-git-274cea35c6d409cfb16862ff24e789b2d3ea3ee3.tar.gz | |
patch 8.1.0370: not using internal diff if 'diffopt' is not changedv8.1.0370
Problem: Not using internal diff if 'diffopt' is not changed.
Solution: Correct initialization of diff_flags. (Christian Brabandt)
| -rw-r--r-- | src/diff.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/diff.c b/src/diff.c index 4c0792baa..0055cba5a 100644 --- a/src/diff.c +++ b/src/diff.c @@ -31,7 +31,7 @@ static int diff_busy = FALSE; /* ex_diffgetput() is busy */ #define DIFF_VERTICAL 16 // vertical splits #define DIFF_HIDDEN_OFF 32 // diffoff when hidden #define DIFF_INTERNAL 64 // use internal xdiff algorithm -static int diff_flags = DIFF_FILLER; +static int diff_flags = DIFF_INTERNAL | DIFF_FILLER; static long diff_algorithm = 0; diff --git a/src/version.c b/src/version.c index 95fa7dae3..fc93cbf67 100644 --- a/src/version.c +++ b/src/version.c @@ -795,6 +795,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 370, +/**/ 369, /**/ 368, |