Mercurial > vim

changeset 14702:daf8afe6279b v8.1.0363

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0363: internal diff isn't used by default as advertised commit https://github.com/vim/vim/commit/c93262b2e3fb043c685bd4014a35a29111dea484 Author: Bram Moolenaar <Bram@vim.org> 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.
author Christian Brabandt <cb@256bit.org>
date Mon, 10 Sep 2018 21:30:06 +0200
parents d0c4c78e6855
children cd279de83479
files Filelist runtime/doc/options.txt src/option.c src/version.c
diffstat 4 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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 \
--- 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|
--- 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}
--- 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,