diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-09-10 21:15:40 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-09-10 21:15:40 +0200 |
| commit | c93262b2e3fb043c685bd4014a35a29111dea484 (patch) | |
| tree | 11cdf6eb664b9164279d70f7ea3bdcd10bd5517a | |
| parent | f29c1c6aa3f365c025890fab5fb9efbe88eb1761 (diff) | |
patch 8.1.0363: internal diff isn't used by default as advertisedv8.1.0363
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.
| -rw-r--r-- | Filelist | 2 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 2 | ||||
| -rw-r--r-- | src/option.c | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 6 insertions, 2 deletions
@@ -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 index 16aa422151..a02618af40 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -2615,7 +2615,7 @@ A jump table for the options with a short description can be found at |Q_op|. 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 index 98ef98a274..f47549d721 100644 --- 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 index 13c61b86a6..853c86f588 100644 --- 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, |