diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2021-07-14 22:21:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-14 22:21:57 +0200 |
| commit | 682247b52e76180e4c49b794c6cc2548bfd32d4c (patch) | |
| tree | f43a922363a24c642a07f891c0648ac60b0a744f /src/nvim/testdir | |
| parent | 19a2e59f7e80f87704ce135fff53e0efdec30432 (diff) | |
| parent | f0cc3a9480ffc30624a70ebd1e30146bc03a7029 (diff) | |
| download | rneovim-682247b52e76180e4c49b794c6cc2548bfd32d4c.tar.gz rneovim-682247b52e76180e4c49b794c6cc2548bfd32d4c.tar.bz2 rneovim-682247b52e76180e4c49b794c6cc2548bfd32d4c.zip | |
Merge pull request #15078 from bfredl/p_vim_vi
refactor(options): remove obsolete distinction of "vi" vs "vim" defaults
Diffstat (limited to 'src/nvim/testdir')
| -rw-r--r-- | src/nvim/testdir/setup.vim | 2 | ||||
| -rw-r--r-- | src/nvim/testdir/test_mksession.vim | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/nvim/testdir/setup.vim b/src/nvim/testdir/setup.vim index fd9cfb54be..fcbc28fdc0 100644 --- a/src/nvim/testdir/setup.vim +++ b/src/nvim/testdir/setup.vim @@ -20,7 +20,7 @@ set tags=./tags,tags set undodir^=. set wildoptions= set startofline -set sessionoptions&vi +set sessionoptions+=options " Prevent Nvim log from writing to stderr. let $NVIM_LOG_FILE = exists($NVIM_LOG_FILE) ? $NVIM_LOG_FILE : 'Xnvim.log' diff --git a/src/nvim/testdir/test_mksession.vim b/src/nvim/testdir/test_mksession.vim index 4e46dbac16..4026f2bf98 100644 --- a/src/nvim/testdir/test_mksession.vim +++ b/src/nvim/testdir/test_mksession.vim @@ -170,7 +170,7 @@ func Test_mksession_rtp() return endif new - set sessionoptions&vi + set sessionoptions+=options let _rtp=&rtp " Make a real long (invalid) runtimepath value, " that should exceed PATH_MAX (hopefully) @@ -290,7 +290,7 @@ endfunc if has('extra_search') func Test_mksession_hlsearch() - set sessionoptions&vi + set sessionoptions+=options set hlsearch mksession! Xtest_mks.out nohlsearch @@ -630,7 +630,7 @@ endfunc " Test for mksession with a named scratch buffer func Test_mksession_scratch() - set sessionoptions&vi + set sessionoptions+=options enew | only file Xscratch set buftype=nofile |