aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/options.lua6
-rw-r--r--src/nvim/testdir/test_timers.vim2
2 files changed, 5 insertions, 3 deletions
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',
diff --git a/src/nvim/testdir/test_timers.vim b/src/nvim/testdir/test_timers.vim
index 5a0939a6a1..fe5d61fad4 100644
--- a/src/nvim/testdir/test_timers.vim
+++ b/src/nvim/testdir/test_timers.vim
@@ -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()