Mercurial > vim

diff src/diff.c @ 14716:973d3f4d8017 v8.1.0370

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Christian Brabandt <cb@256bit.org>
date Wed, 12 Sep 2018 18:15:08 +0200
parents 195e8b1fcbbf
children 655f00c29c58
line wrap: on
line diff
--- 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;