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
index 343a2bd5c4679ce73a1583a4d9f077b3a45af795..59415d3d23d2cb657fcad11f2fa9382ef95c5eab 100644 (file)
--- 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
index 16aa422151954210fa8b45b30d4d82c0211183bd..a02618af400fff4a46faff0fadc656f3deb38c05 100644 (file)
--- 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 98ef98a274288a6915b535ba624ea9cb8c189dc1..f47549d721e7952b490025e315ece8c800a633cd 100644 (file)
--- 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 13c61b86a6c11d051e27527351bd1fdc7f0deca4..853c86f58807cfb4407fe1e6833ba7c5e41e06c4 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -794,6 +794,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    363,
 /**/
     362,
 /**/