diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2019-03-17 22:12:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-17 22:12:39 +0100 |
| commit | f3e7815e613305b10badf4f8bfaf5870dfb506bb (patch) | |
| tree | f91d3b1083718421e3919c94f18830aceedb1034 /src | |
| parent | d86c816f8cae993dd21ab6ce932eb36a3e965dcb (diff) | |
| parent | 94d933aa7e3fde09d45a59cfb289afdab4ce4aaa (diff) | |
| download | rneovim-f3e7815e613305b10badf4f8bfaf5870dfb506bb.tar.gz rneovim-f3e7815e613305b10badf4f8bfaf5870dfb506bb.tar.bz2 rneovim-f3e7815e613305b10badf4f8bfaf5870dfb506bb.zip | |
Merge #9747 from janlazo/vim-8.1.0858
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/options.lua | 6 | ||||
| -rw-r--r-- | src/nvim/testdir/test_timers.vim | 2 |
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() |