Mercurial > vim
comparison src/option.c @ 14702:daf8afe6279b v8.1.0363
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 | 0a3b9ecf7cb8 |
| children | 00da090af0ab |
comparison
equal
deleted
inserted
replaced
| 14701:d0c4c78e6855 | 14702:daf8afe6279b |
|---|---|
| 1047 SCTX_INIT}, | 1047 SCTX_INIT}, |
| 1048 {"diffopt", "dip", P_STRING|P_ALLOCED|P_VI_DEF|P_RWIN|P_ONECOMMA | 1048 {"diffopt", "dip", P_STRING|P_ALLOCED|P_VI_DEF|P_RWIN|P_ONECOMMA |
| 1049 |P_NODUP, | 1049 |P_NODUP, |
| 1050 #ifdef FEAT_DIFF | 1050 #ifdef FEAT_DIFF |
| 1051 (char_u *)&p_dip, PV_NONE, | 1051 (char_u *)&p_dip, PV_NONE, |
| 1052 {(char_u *)"filler", (char_u *)NULL} | 1052 {(char_u *)"internal,filler", (char_u *)NULL} |
| 1053 #else | 1053 #else |
| 1054 (char_u *)NULL, PV_NONE, | 1054 (char_u *)NULL, PV_NONE, |
| 1055 {(char_u *)"", (char_u *)NULL} | 1055 {(char_u *)"", (char_u *)NULL} |
| 1056 #endif | 1056 #endif |
| 1057 SCTX_INIT}, | 1057 SCTX_INIT}, |