aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.1.0858: 'indentkeys' and 'cinkeys' defaults are different

Browse Source 
Problem:    'indentkeys' and 'cinkeys' defaults are different.
Solution:   Make them the same, update docs. (close #3882)
This commit is contained in:
Bram Moolenaar 2019-01-31 14:12:57 +01:00
parent 4b47162cce
commit ce655743ba
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
runtime/doc/indent.txt
View File

@ -60,12 +60,13 @@ typing certain characters or commands in certain contexts. Note that this not
only triggers C-indenting. When 'indentexpr' is not empty 'indentkeys' is only triggers C-indenting. When 'indentexpr' is not empty 'indentkeys' is
used instead. The format of 'cinkeys' and 'indentkeys' is equal. used instead. The format of 'cinkeys' and 'indentkeys' is equal.
The default is "0{,0},0),:,0#,!^F,o,O,e" which specifies that indenting occurs The default is "0{,0},0),0],:,0#,!^F,o,O,e" which specifies that indenting
as follows: occurs as follows:
"0{" if you type '{' as the first character in a line "0{" if you type '{' as the first character in a line
"0}" if you type '}' as the first character in a line "0}" if you type '}' as the first character in a line
"0)" if you type ')' as the first character in a line "0)" if you type ')' as the first character in a line
"0]" if you type ']' as the first character in a line
":" if you type ':' after a label or case statement ":" if you type ':' after a label or case statement
"0#" if you type '#' as the first character in a line "0#" if you type '#' as the first character in a line
"!^F" if you type CTRL-F (which is not inserted) "!^F" if you type CTRL-F (which is not inserted)

4
runtime/doc/options.txt
View File

@ -1564,7 +1564,7 @@ A jump table for the options with a short description can be found at |Q_op|.
NOTE: This option is reset when 'compatible' is set. NOTE: This option is reset when 'compatible' is set.
*'cinkeys'* *'cink'* *'cinkeys'* *'cink'*
'cinkeys' 'cink' string (default "0{,0},0),:,0#,!^F,o,O,e") 'cinkeys' 'cink' string (default "0{,0},0),0],:,0#,!^F,o,O,e")
local to buffer local to buffer
{not in Vi} {not in Vi}
{not available when compiled without the |+cindent| {not available when compiled without the |+cindent|
@ -4607,7 +4607,7 @@ A jump table for the options with a short description can be found at |Q_op|.
*'indentkeys'* *'indk'* *'indentkeys'* *'indk'*
'indentkeys' 'indk' string (default "0{,0},:,0#,!^F,o,O,e") 'indentkeys' 'indk' string (default "0{,0},0),0],:,0#,!^F,o,O,e")
local to buffer local to buffer
{not in Vi} {not in Vi}
{not available when compiled without the |+cindent| {not available when compiled without the |+cindent|

7
src/option.c
View File

@ -483,6 +483,9 @@ struct vimoption
# define DEFAULT_PYTHON_VER 0 # define DEFAULT_PYTHON_VER 0
#endif #endif
// used for 'cinkeys' and 'indentkeys'
#define INDENTKEYS_DEFAULT (char_u *)"0{,0},0),0],:,0#,!^F,o,O,e"
/* /*
* options[] is initialized here. * options[] is initialized here.
* The order of the options MUST be alphabetic for ":set all" and findoption(). * 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, {"cinkeys", "cink", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP,
#ifdef FEAT_CINDENT #ifdef FEAT_CINDENT
(char_u *)&p_cink, PV_CINK, (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 #else
(char_u *)NULL, PV_NONE, (char_u *)NULL, PV_NONE,
{(char_u *)0L, (char_u *)0L} {(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, {"indentkeys", "indk", P_STRING|P_ALLOCED|P_VI_DEF|P_ONECOMMA|P_NODUP,
#if defined(FEAT_CINDENT) && defined(FEAT_EVAL) #if defined(FEAT_CINDENT) && defined(FEAT_EVAL)
(char_u *)&p_indk, PV_INDK, (char_u *)&p_indk, PV_INDK,
{(char_u *)"0{,0},:,0#,!^F,o,O,e", (char_u *)0L} {INDENTKEYS_DEFAULT, (char_u *)0L}
#else #else
(char_u *)NULL, PV_NONE, (char_u *)NULL, PV_NONE,
{(char_u *)0L, (char_u *)0L} {(char_u *)0L, (char_u *)0L}

2
src/version.c
View File

@ -783,6 +783,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 */
/**/
858,
/**/ /**/
857, 857,
/**/ /**/