From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 12 Sep 2018 16:00:12 +0000 (+0200)
Subject: patch 8.1.0370: not using internal diff if 'diffopt' is not changed
X-Git-Tag: v8.1.0370
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=274cea35c6d409cfb16862ff24e789b2d3ea3ee3;p=thirdparty%2Fvim.git

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 4c0792baae..0055cba5ac 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 95fa7dae3c..fc93cbf67a 100644
--- 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,
 /**/