diff options
| -rw-r--r-- | runtime/doc/options.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/vim_diff.txt | 1 | ||||
| -rw-r--r-- | src/nvim/options.lua | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/setup.vim | 1 | ||||
| -rw-r--r-- | src/nvim/testdir/test_quickfix.vim | 2 |
5 files changed, 5 insertions, 3 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 484ea4465f..4f54e71d79 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -6116,7 +6116,7 @@ A jump table for the options with a short description can be found at |Q_op|. specify special kinds of buffers. See |special-buffers|. *'switchbuf'* *'swb'* -'switchbuf' 'swb' string (default "") +'switchbuf' 'swb' string (default "uselast") global This option controls the behavior when switching between buffers. Possible values (comma separated list): diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt index d96eb84a79..51159b9840 100644 --- a/runtime/doc/vim_diff.txt +++ b/runtime/doc/vim_diff.txt @@ -56,6 +56,7 @@ the differences. - 'sidescroll' defaults to 1 - 'smarttab' is enabled - 'startofline' is disabled +- 'switchbuf' defaults to "uselast" - 'tabpagemax' defaults to 50 - 'tags' defaults to "./tags;,tags" - 'ttimeoutlen' defaults to 50 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') |