diff options
| author | James McCoy <jamessan@jamessan.com> | 2019-12-15 21:17:16 -0500 |
|---|---|---|
| committer | James McCoy <jamessan@jamessan.com> | 2019-12-15 21:17:16 -0500 |
| commit | 6566251d144d2c9c9e08e05c8c3a3fe9915a19b8 (patch) | |
| tree | 980fd0c7287e295c8ac72858b0794f72224415e0 /src/nvim/options.lua | |
| parent | 9c4223215f71e1212462ada4e698be1b31437dd9 (diff) | |
| parent | 9f3d483c79f03c48239fdc82cc02e8685a03d22a (diff) | |
| download | rneovim-6566251d144d2c9c9e08e05c8c3a3fe9915a19b8.tar.gz rneovim-6566251d144d2c9c9e08e05c8c3a3fe9915a19b8.tar.bz2 rneovim-6566251d144d2c9c9e08e05c8c3a3fe9915a19b8.zip | |
Merge remote-tracking branch 'upstream/master' into libcall
Diffstat (limited to 'src/nvim/options.lua')
| -rw-r--r-- | src/nvim/options.lua | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/src/nvim/options.lua b/src/nvim/options.lua index 52e788944b..93bfc1c0b1 100644 --- a/src/nvim/options.lua +++ b/src/nvim/options.lua @@ -612,7 +612,7 @@ return { alloced=true, redraw={'current_window'}, varname='p_dip', - defaults={if_true={vi="internal,filler"}} + defaults={if_true={vi="internal,filler,closeoff"}} }, { full_name='digraph', abbreviation='dg', @@ -804,11 +804,12 @@ return { }, { full_name='fillchars', abbreviation='fcs', - type='string', list='onecomma', scope={'window'}, + type='string', list='onecomma', scope={'global', 'window'}, deny_duplicates=true, vi_def=true, alloced=true, redraw={'current_window'}, + varname='p_fcs', defaults={if_true={vi=''}} }, { @@ -1299,6 +1300,14 @@ return { defaults={if_true={vi=true}} }, { + full_name='jumpoptions', abbreviation='jop', + type='string', list='onecomma', scope={'global'}, + deny_duplicates=true, + varname='p_jop', + vim=true, + defaults={if_true={vim=''}} + }, + { full_name='keymap', abbreviation='kmp', type='string', scope={'buffer'}, normal_fname_chars=true, @@ -1420,11 +1429,12 @@ return { }, { full_name='listchars', abbreviation='lcs', - type='string', list='onecomma', scope={'window'}, + type='string', list='onecomma', scope={'global', 'window'}, deny_duplicates=true, vim=true, alloced=true, redraw={'current_window'}, + varname='p_lcs', defaults={if_true={vi="eol:$", vim="tab:> ,trail:-,nbsp:+"}} }, { @@ -2323,9 +2333,9 @@ return { full_name='startofline', abbreviation='sol', type='bool', scope={'global'}, vi_def=true, - vim=true, + vim=false, varname='p_sol', - defaults={if_true={vi=true}} + defaults={if_true={vi=false}} }, { full_name='statusline', abbreviation='stl', @@ -2389,6 +2399,14 @@ return { defaults={if_true={vi=""}} }, { + full_name='tagfunc', abbreviation='tfu', + type='string', scope={'buffer'}, + vim=true, + vi_def=true, + varname='p_tfu', + defaults={if_true={vi=""}} + }, + { full_name='tabline', abbreviation='tal', type='string', scope={'global'}, vi_def=true, |