patch 8.1.0370: not using internal diff if 'diffopt' is not changed

Problem:    Not using internal diff if 'diffopt' is not changed.
Solution:   Correct initialization of diff_flags. (Christian Brabandt)

diff --git a/src/diff.c b/src/diff.c
index 4c0792baae079c36a77f987c23a06b4a4412fab8..0055cba5ac8dbc91dc5130536dc49e948e7f45c8 100644 (file)
--- 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 95fa7dae3cccc9becaeb011d8004900c23636230..fc93cbf67a8f382fa08ae032b0068254acb50315 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -794,6 +794,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    370,
 /**/
     369,
 /**/