mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
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.
This commit is contained in:
parent
f29c1c6aa3
commit
c93262b2e3
2
Filelist
2
Filelist
@ -273,6 +273,8 @@ SRC_ALL = \
|
|||||||
src/libvterm/t/92lp1640917.test \
|
src/libvterm/t/92lp1640917.test \
|
||||||
src/libvterm/t/harness.c \
|
src/libvterm/t/harness.c \
|
||||||
src/libvterm/t/run-test.pl \
|
src/libvterm/t/run-test.pl \
|
||||||
|
src/xdiff/COPYING \
|
||||||
|
src/xdiff/README.txt \
|
||||||
src/xdiff/xdiff.h \
|
src/xdiff/xdiff.h \
|
||||||
src/xdiff/xdiffi.c \
|
src/xdiff/xdiffi.c \
|
||||||
src/xdiff/xdiffi.h \
|
src/xdiff/xdiffi.h \
|
||||||
|
@ -2615,7 +2615,7 @@ A jump table for the options with a short description can be found at |Q_op|.
|
|||||||
security reasons.
|
security reasons.
|
||||||
|
|
||||||
*'dip'* *'diffopt'*
|
*'dip'* *'diffopt'*
|
||||||
'diffopt' 'dip' string (default "filler")
|
'diffopt' 'dip' string (default "internal,filler")
|
||||||
global
|
global
|
||||||
{not in Vi}
|
{not in Vi}
|
||||||
{not available when compiled without the |+diff|
|
{not available when compiled without the |+diff|
|
||||||
|
@ -1049,7 +1049,7 @@ static struct vimoption options[] =
|
|||||||
|P_NODUP,
|
|P_NODUP,
|
||||||
#ifdef FEAT_DIFF
|
#ifdef FEAT_DIFF
|
||||||
(char_u *)&p_dip, PV_NONE,
|
(char_u *)&p_dip, PV_NONE,
|
||||||
{(char_u *)"filler", (char_u *)NULL}
|
{(char_u *)"internal,filler", (char_u *)NULL}
|
||||||
#else
|
#else
|
||||||
(char_u *)NULL, PV_NONE,
|
(char_u *)NULL, PV_NONE,
|
||||||
{(char_u *)"", (char_u *)NULL}
|
{(char_u *)"", (char_u *)NULL}
|
||||||
|
@ -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 */
|
||||||
|
/**/
|
||||||
|
363,
|
||||||
/**/
|
/**/
|
||||||
362,
|
362,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user