# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1536768908 -7200
# Node ID 973d3f4d8017d05533d862c3c248019dfd5f2bee
# Parent  8b84ae8ebcdd3d0309e5a1b0daf2cc1ea35ccee8
patch 8.1.0370: not using internal diff if 'diffopt' is not changed

commit https://github.com/vim/vim/commit/274cea35c6d409cfb16862ff24e789b2d3ea3ee3
Author: Bram Moolenaar <Bram@vim.org>
Date:   Wed Sep 12 18:00:12 2018 +0200

    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
--- a/src/diff.c
+++ b/src/diff.c
@@ -31,7 +31,7 @@ static int	diff_busy = FALSE;	/* ex_diff
 #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
--- 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,