diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-01-31 14:12:57 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-01-31 14:12:57 +0100 |
| commit | ce655743ba5c56c00769e57e6a6608c0088211ab (patch) | |
| tree | c2c038dd034db0123e4f711a1f530f1dfea806b3 /src | |
| parent | 4b47162ccede0b6d9cbb9473ad870220a24fbf54 (diff) | |
patch 8.1.0858: 'indentkeys' and 'cinkeys' defaults are differentv8.1.0858
Problem: 'indentkeys' and 'cinkeys' defaults are different.
Solution: Make them the same, update docs. (close #3882)
Diffstat (limited to 'src')
| -rw-r--r-- | src/option.c | 7 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/option.c b/src/option.c index dda5414e61..abbbaa5873 100644 --- a/src/option.c +++ b/src/option.c @@ -483,6 +483,9 @@ struct vimoption # define DEFAULT_PYTHON_VER 0 #endif +// used for 'cinkeys' and 'indentkeys' +#define INDENTKEYS_DEFAULT (char_u *)"0{,0},0),0],:,0#,!^F,o,O,e" + /* * options[] is initialized here. * The order of the options MUST be alphabetic for ":set all" and findoption(). @@ -757,7 +760,7 @@ static struct vimoption options[] = {"cinkeys", "cink", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP, #ifdef FEAT_CINDENT (char_u *)&p_cink, PV_CINK, - {(char_u *)"0{,0},0),:,0#,!^F,o,O,e", (char_u *)0L} + {INDENTKEYS_DEFAULT, (char_u *)0L} #else (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} @@ -1570,7 +1573,7 @@ static struct vimoption options[] = {"indentkeys", "indk", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP, #if defined(FEAT_CINDENT) && defined(FEAT_EVAL) (char_u *)&p_indk, PV_INDK, - {(char_u *)"0{,0},:,0#,!^F,o,O,e", (char_u *)0L} + {INDENTKEYS_DEFAULT, (char_u *)0L} #else (char_u *)NULL, PV_NONE, {(char_u *)0L, (char_u *)0L} diff --git a/src/version.c b/src/version.c index f7dd664299..9422f8426c 100644 --- a/src/version.c +++ b/src/version.c @@ -784,6 +784,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 858, +/**/ 857, /**/ 856, |