diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-03-17 12:19:39 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2019-03-17 12:27:34 -0400 |
| commit | 536be31a198a67b10b21006fd6891852b6c64917 (patch) | |
| tree | 878ecf75decf25f027ef7f2eb159e84ee97ad830 | |
| parent | 9ef8d0d6b0a8a607b2ee3fe3ca38395e470a2223 (diff) | |
| download | rneovim-536be31a198a67b10b21006fd6891852b6c64917.tar.gz rneovim-536be31a198a67b10b21006fd6891852b6c64917.tar.bz2 rneovim-536be31a198a67b10b21006fd6891852b6c64917.zip | |
vim-patch:8.1.0858: 'indentkeys' and 'cinkeys' defaults are different
Problem: 'indentkeys' and 'cinkeys' defaults are different.
Solution: Make them the same, update docs. (close vim/vim#3882)
https://github.com/vim/vim/commit/ce655743ba5c56c00769e57e6a6608c0088211ab
| -rw-r--r-- | runtime/doc/indent.txt | 5 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 4 | ||||
| -rw-r--r-- | src/nvim/options.lua | 6 |
3 files changed, 9 insertions, 6 deletions
diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt index aae091aa99..6820b9c240 100644 --- a/runtime/doc/indent.txt +++ b/runtime/doc/indent.txt @@ -56,12 +56,13 @@ typing certain characters or commands in certain contexts. Note that this not only triggers C-indenting. When 'indentexpr' is not empty 'indentkeys' is 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 -as follows: +The default is "0{,0},0),0],:,0#,!^F,o,O,e" which specifies that indenting +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 ":" if you type ':' after a label or case statement "0#" if you type '#' as the first character in a line "!^F" if you type CTRL-F (which is not inserted) diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 7bb9ae68bc..c7e247133c 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -1214,7 +1214,7 @@ A jump table for the options with a short description can be found at |Q_op|. This option is not used when 'paste' is set. *'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 A list of keys that, when typed in Insert mode, cause reindenting of the current line. Only used if 'cindent' is on and 'indentexpr' is @@ -3265,7 +3265,7 @@ A jump table for the options with a short description can be found at |Q_op|. *'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 A list of keys that, when typed in Insert mode, cause reindenting of the current line. Only happens if 'indentexpr' isn't empty. diff --git a/src/nvim/options.lua b/src/nvim/options.lua index 81133ae15c..30c234686f 100644 --- a/src/nvim/options.lua +++ b/src/nvim/options.lua @@ -44,6 +44,8 @@ local N_=function(s) return 'N_(' .. cstr(s) .. ')' end end +-- used for 'cinkeys' and 'indentkeys' +local indentkeys_default = '0{,0},0),0],:,0#,!^F,o,O,e'; return { cstr=cstr, options={ @@ -319,7 +321,7 @@ return { vi_def=true, alloced=true, varname='p_cink', - defaults={if_true={vi="0{,0},0),:,0#,!^F,o,O,e"}} + defaults={if_true={vi=indentkeys_default}} }, { full_name='cinoptions', abbreviation='cino', @@ -1218,7 +1220,7 @@ return { vi_def=true, alloced=true, varname='p_indk', - defaults={if_true={vi="0{,0},:,0#,!^F,o,O,e"}} + defaults={if_true={vi=indentkeys_default}} }, { full_name='infercase', abbreviation='inf', |