# HG changeset patch # User Christian Brabandt # Date 1536607806 -7200 # Node ID daf8afe6279b86ff283fcda74f13f372ff1d9073 # Parent d0c4c78e68555e3a3cc406170ed04f8dbb6d274b patch 8.1.0363: internal diff isn't used by default as advertised commit https://github.com/vim/vim/commit/c93262b2e3fb043c685bd4014a35a29111dea484 Author: Bram Moolenaar Date: Mon Sep 10 21:15:40 2018 +0200 patch 8.1.0363: internal diff isn't used by default as advertised Problem: Internal diff isn't used by default as advertised. Solution: Add "internal" to the default value of 'diffopt'. Also add couple of files missing from the distribution. diff --git a/Filelist b/Filelist --- a/Filelist +++ b/Filelist @@ -273,6 +273,8 @@ SRC_ALL = \ src/libvterm/t/92lp1640917.test \ src/libvterm/t/harness.c \ src/libvterm/t/run-test.pl \ + src/xdiff/COPYING \ + src/xdiff/README.txt \ src/xdiff/xdiff.h \ src/xdiff/xdiffi.c \ src/xdiff/xdiffi.h \ diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -2615,7 +2615,7 @@ A jump table for the options with a shor security reasons. *'dip'* *'diffopt'* -'diffopt' 'dip' string (default "filler") +'diffopt' 'dip' string (default "internal,filler") global {not in Vi} {not available when compiled without the |+diff| diff --git a/src/option.c b/src/option.c --- a/src/option.c +++ b/src/option.c @@ -1049,7 +1049,7 @@ static struct vimoption options[] = |P_NODUP, #ifdef FEAT_DIFF (char_u *)&p_dip, PV_NONE, - {(char_u *)"filler", (char_u *)NULL} + {(char_u *)"internal,filler", (char_u *)NULL} #else (char_u *)NULL, PV_NONE, {(char_u *)"", (char_u *)NULL} 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 */ /**/ + 363, +/**/ 362, /**/ 361,