diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2017-03-17 13:00:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-17 13:00:19 +0100 |
| commit | 0c1f7831649e92b6904ca580ee90acd6ba89d1a8 (patch) | |
| tree | 0d3980fa4a77c305083dfc3a4ee24249e328408e /src | |
| parent | 10045cddb6710ea92337d30fb15deded1fe6b432 (diff) | |
| parent | 1dbe7a4decdd7e93153c0c3cb81197531b719b81 (diff) | |
| download | rneovim-0c1f7831649e92b6904ca580ee90acd6ba89d1a8.tar.gz rneovim-0c1f7831649e92b6904ca580ee90acd6ba89d1a8.tar.bz2 rneovim-0c1f7831649e92b6904ca580ee90acd6ba89d1a8.zip | |
Merge #6087 from justinmk/defaults
defaults: 'ruler', 'showcmd', 'belloff=all'
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/api/private/handle.h | 3 | ||||
| -rw-r--r-- | src/nvim/options.lua | 10 | ||||
| -rw-r--r-- | src/nvim/testdir/setup.vim | 4 |
3 files changed, 10 insertions, 7 deletions
diff --git a/src/nvim/api/private/handle.h b/src/nvim/api/private/handle.h index 30bbfbee1b..26e9dc3314 100644 --- a/src/nvim/api/private/handle.h +++ b/src/nvim/api/private/handle.h @@ -10,8 +10,11 @@ void handle_register_##name(type *name); \ void handle_unregister_##name(type *name); +// handle_get_buffer handle_register_buffer, handle_unregister_buffer HANDLE_DECLS(buf_T, buffer) +// handle_get_window handle_register_window, handle_unregister_window HANDLE_DECLS(win_T, window) +// handle_get_tabpage handle_register_tabpage, handle_unregister_tabpage HANDLE_DECLS(tabpage_T, tabpage) void handle_init(void); diff --git a/src/nvim/options.lua b/src/nvim/options.lua index e12860c0cc..1476fdda2c 100644 --- a/src/nvim/options.lua +++ b/src/nvim/options.lua @@ -190,7 +190,7 @@ return { type='string', list='comma', scope={'global'}, vi_def=true, varname='p_bo', - defaults={if_true={vi=""}} + defaults={if_true={vi="all"}} }, { full_name='binary', abbreviation='bin', @@ -1883,7 +1883,7 @@ return { vim=true, redraw={'statuslines'}, varname='p_ru', - defaults={if_true={vi=false}} + defaults={if_true={vi=true}} }, { full_name='rulerformat', abbreviation='ruf', @@ -2119,11 +2119,7 @@ return { type='bool', scope={'global'}, vim=true, varname='p_sc', - defaults={ - condition='UNIX', - if_true={vi=false, vim=false}, - if_false={vi=false, vim=true}, - } + defaults={if_true={vi=false, vim=true}} }, { full_name='showfulltag', abbreviation='sft', diff --git a/src/nvim/testdir/setup.vim b/src/nvim/testdir/setup.vim index 52876d1e6c..05257d566d 100644 --- a/src/nvim/testdir/setup.vim +++ b/src/nvim/testdir/setup.vim @@ -1,5 +1,9 @@ " Common preparations for running tests. +set noruler +set noshowcmd +set belloff= + " Make sure 'runtimepath' does not include $HOME. set rtp=$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after |