aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/options.lua2
-rw-r--r--src/nvim/testdir/setup.vim1
-rw-r--r--src/nvim/testdir/test_quickfix.vim2
3 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index 7e4609d2ce..585f8d638a 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -2390,7 +2390,7 @@ return {
type='string', list='onecomma', scope={'global'},
deny_duplicates=true,
varname='p_swb',
- defaults={if_true={vi=""}}
+ defaults={if_true={vi="uselast"}}
},
{
full_name='synmaxcol', abbreviation='smc',
diff --git a/src/nvim/testdir/setup.vim b/src/nvim/testdir/setup.vim
index 4e072ed689..b15df2ea03 100644
--- a/src/nvim/testdir/setup.vim
+++ b/src/nvim/testdir/setup.vim
@@ -21,6 +21,7 @@ set undodir^=.
set wildoptions=
set startofline
set sessionoptions+=options
+set switchbuf=
" Unmap Nvim default mappings.
unmap Y
diff --git a/src/nvim/testdir/test_quickfix.vim b/src/nvim/testdir/test_quickfix.vim
index 5090584e41..283e7bbafe 100644
--- a/src/nvim/testdir/test_quickfix.vim
+++ b/src/nvim/testdir/test_quickfix.vim
@@ -1911,7 +1911,7 @@ func Test_switchbuf()
enew | only
set switchbuf=useopen
cexpr "Xqftestfile1:1:10"
- call assert_equal('', &switchbuf)
+ call assert_equal('uselast', &switchbuf)
call delete('Xqftestfile1')
call delete('Xqftestfile2')