kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-12-24 05:05:00 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge #9747 from janlazo/vim-8.1.0858

Browse Source
This commit is contained in:
Justin M. Keyes 2019-03-17 22:12:39 +01:00 committed by GitHub
commit f3e7815e61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
runtime/doc/indent.txt
View File

@ -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)

4
runtime/doc/options.txt
View File

@ -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.

6
src/nvim/options.lua
View File

@ -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',

2
src/nvim/testdir/test_timers.vim
View File

@ -52,7 +52,7 @@ func Test_repeat_many()
endif
sleep 200m
call timer_stop(timer)
call assert_inrange((has('mac') ? 1 : 2), 4, g:val)
call s:assert_inrange((has('mac') ? 1 : 2), 4, g:val)
endfunc
func Test_with_partial_callback()