mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-27 21:48:35 +00: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
parent d86c816f8c 94d933aa7e
commit f3e7815e61
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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