thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

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

Browse Source 
Problem:    Not using internal diff if 'diffopt' is not changed.
Solution:   Correct initialization of diff_flags. (Christian Brabandt)
This commit is contained in:
Bram Moolenaar
2018-09-12 18:00:12 +02:00
parent 67f8ab8299
commit 274cea35c6
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/diff.c
View File

@@ -31,7 +31,7 @@ static int diff_busy = FALSE; /* ex_diffgetput() is busy */
#define DIFF_VERTICAL 16 // vertical splits #define DIFF_VERTICAL 16 // vertical splits
#define DIFF_HIDDEN_OFF 32 // diffoff when hidden #define DIFF_HIDDEN_OFF 32 // diffoff when hidden
#define DIFF_INTERNAL 64 // use internal xdiff algorithm #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; static long diff_algorithm = 0;

2
src/version.c
View File

@@ -794,6 +794,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
370,
/**/ /**/
369, 369,
/**/ /**/