aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/options.lua10
-rw-r--r--src/nvim/testdir/setup.vim4
2 files changed, 7 insertions, 7 deletions
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