From f6c72b745cfbaaba80555de9a5d4b25f30f17ab2 Mon Sep 17 00:00:00 2001 From: Gregory Anders Date: Tue, 17 Aug 2021 12:12:09 -0600 Subject: feat(defaults): set hidden --- src/nvim/options.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/nvim/options.lua b/src/nvim/options.lua index a44664d780..685c063e62 100644 --- a/src/nvim/options.lua +++ b/src/nvim/options.lua @@ -1081,7 +1081,7 @@ return { short_desc=N_("don't unload buffer when it is |abandon|ed"), type='bool', scope={'global'}, varname='p_hid', - defaults={if_true=false} + defaults={if_true=true} }, { full_name='highlight', abbreviation='hl', -- cgit From d417e67e595a9eb19797866e91bb80b4fe299a94 Mon Sep 17 00:00:00 2001 From: Gregory Anders Date: Tue, 17 Aug 2021 12:12:47 -0600 Subject: feat(defaults): set nojoinspaces --- src/nvim/options.lua | 2 +- src/nvim/testdir/setup.vim | 1 + src/nvim/testdir/test_join.vim | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/nvim/options.lua b/src/nvim/options.lua index 685c063e62..df2a8edc04 100644 --- a/src/nvim/options.lua +++ b/src/nvim/options.lua @@ -1288,7 +1288,7 @@ return { short_desc=N_("two spaces after a period with a join command"), type='bool', scope={'global'}, varname='p_js', - defaults={if_true=true} + defaults={if_true=false} }, { full_name='jumpoptions', abbreviation='jop', diff --git a/src/nvim/testdir/setup.vim b/src/nvim/testdir/setup.vim index 58ce0f1a4c..b3df8c63e6 100644 --- a/src/nvim/testdir/setup.vim +++ b/src/nvim/testdir/setup.vim @@ -12,6 +12,7 @@ set directory^=. set fillchars=vert:\|,fold:- set laststatus=1 set listchars=eol:$ +set joinspaces set nohidden smarttab noautoindent noautoread complete-=i noruler noshowcmd set nrformats+=octal set shortmess-=F diff --git a/src/nvim/testdir/test_join.vim b/src/nvim/testdir/test_join.vim index ac6ef8f29f..cdb0562756 100644 --- a/src/nvim/testdir/test_join.vim +++ b/src/nvim/testdir/test_join.vim @@ -35,6 +35,7 @@ endfunc " Tests for setting the '[,'] marks when joining lines. func Test_join_marks() + set joinspaces enew call append(0, [ \ "\t\tO sodales, ludite, vos qui", @@ -53,6 +54,7 @@ func Test_join_marks() call assert_equal([0, 4, 11, 0], getpos("'[")) call assert_equal([0, 4, 67, 0], getpos("']")) enew! + set nojoinspaces endfunc " Test for joining lines and marks in them -- cgit From d8ab8cccd0cf5acdf3e7c3ca229cad4160a6fc2e Mon Sep 17 00:00:00 2001 From: Gregory Anders Date: Tue, 17 Aug 2021 21:30:58 -0600 Subject: test: update tests to work with 'hidden' --- src/nvim/testdir/test42.in | Bin 2373 -> 2387 bytes src/nvim/testdir/test_autocmd.vim | 1 + src/nvim/testdir/test_command_count.vim | 2 +- src/nvim/testdir/test_diffmode.vim | 4 ++-- src/nvim/testdir/test_gf.vim | 2 +- src/nvim/testdir/test_ins_complete.vim | 2 +- src/nvim/testdir/test_join.vim | 4 +--- src/nvim/testdir/test_mksession.vim | 2 +- src/nvim/testdir/test_options.vim | 2 +- src/nvim/testdir/test_tagjump.vim | 2 +- src/nvim/testdir/test_window_cmd.vim | 2 +- 11 files changed, 11 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/nvim/testdir/test42.in b/src/nvim/testdir/test42.in index d9057e72fb..456f9ddb07 100644 Binary files a/src/nvim/testdir/test42.in and b/src/nvim/testdir/test42.in differ diff --git a/src/nvim/testdir/test_autocmd.vim b/src/nvim/testdir/test_autocmd.vim index c8138e5ca9..015979e1be 100644 --- a/src/nvim/testdir/test_autocmd.vim +++ b/src/nvim/testdir/test_autocmd.vim @@ -998,6 +998,7 @@ func Test_bufunload_all() endfunc au BufUnload * call UnloadAllBufs() au VimLeave * call writefile(['Test Finished'], 'Xout') + set nohidden edit Xxx1 split Xxx2 q diff --git a/src/nvim/testdir/test_command_count.vim b/src/nvim/testdir/test_command_count.vim index 55b230373f..c7dddf4164 100644 --- a/src/nvim/testdir/test_command_count.vim +++ b/src/nvim/testdir/test_command_count.vim @@ -33,7 +33,7 @@ func Test_command_count_0() delcommand RangeBuffers delcommand RangeBuffersAll - set hidden& + set nohidden set swapfile& endfunc diff --git a/src/nvim/testdir/test_diffmode.vim b/src/nvim/testdir/test_diffmode.vim index 5c9c1ce884..f39cda7663 100644 --- a/src/nvim/testdir/test_diffmode.vim +++ b/src/nvim/testdir/test_diffmode.vim @@ -540,7 +540,7 @@ func Test_diffopt_hiddenoff() bwipe! bwipe! - set hidden& diffopt& + set nohidden diffopt& endfunc func Test_diffoff_hidden() @@ -577,7 +577,7 @@ func Test_diffoff_hidden() bwipe! bwipe! - set hidden& diffopt& + set nohidden diffopt& endfunc func Test_setting_cursor() diff --git a/src/nvim/testdir/test_gf.vim b/src/nvim/testdir/test_gf.vim index ee548037ba..43efd6248e 100644 --- a/src/nvim/testdir/test_gf.vim +++ b/src/nvim/testdir/test_gf.vim @@ -145,7 +145,7 @@ func Test_gf_visual() bwipe! call delete('Xtest_gf_visual') - set hidden& + set nohidden endfunc func Test_gf_error() diff --git a/src/nvim/testdir/test_ins_complete.vim b/src/nvim/testdir/test_ins_complete.vim index 3da3648fec..0fb026f6b0 100644 --- a/src/nvim/testdir/test_ins_complete.vim +++ b/src/nvim/testdir/test_ins_complete.vim @@ -95,7 +95,7 @@ func Test_ins_complete() call delete('Xtest11.one') call delete('Xtest11.two') call delete('Xtestdata') - set cpt& cot& def& tags& tagbsearch& hidden& + set cpt& cot& def& tags& tagbsearch& nohidden cd .. call delete('Xdir', 'rf') endfunc diff --git a/src/nvim/testdir/test_join.vim b/src/nvim/testdir/test_join.vim index cdb0562756..ecb969d10a 100644 --- a/src/nvim/testdir/test_join.vim +++ b/src/nvim/testdir/test_join.vim @@ -35,7 +35,6 @@ endfunc " Tests for setting the '[,'] marks when joining lines. func Test_join_marks() - set joinspaces enew call append(0, [ \ "\t\tO sodales, ludite, vos qui", @@ -52,9 +51,8 @@ func Test_join_marks() /^This line/;'}-join call assert_equal([0, 4, 11, 0], getpos("'[")) - call assert_equal([0, 4, 67, 0], getpos("']")) + call assert_equal([0, 4, 66, 0], getpos("']")) enew! - set nojoinspaces endfunc " Test for joining lines and marks in them diff --git a/src/nvim/testdir/test_mksession.vim b/src/nvim/testdir/test_mksession.vim index fbe764bbf2..c96c6a9678 100644 --- a/src/nvim/testdir/test_mksession.vim +++ b/src/nvim/testdir/test_mksession.vim @@ -307,7 +307,7 @@ func Test_mksession_buffer_count() call delete('Xbaz') call delete('Xtest_mks.out') %bwipe! - set hidden& + set nohidden endfunc if has('extra_search') diff --git a/src/nvim/testdir/test_options.vim b/src/nvim/testdir/test_options.vim index 8796af7a20..72c151142d 100644 --- a/src/nvim/testdir/test_options.vim +++ b/src/nvim/testdir/test_options.vim @@ -539,7 +539,7 @@ func Test_copy_winopt() call assert_equal(4,&numberwidth) bw! - set hidden& + set nohidden endfunc func Test_shortmess_F() diff --git a/src/nvim/testdir/test_tagjump.vim b/src/nvim/testdir/test_tagjump.vim index 68dcfb6890..b6d9143bc9 100644 --- a/src/nvim/testdir/test_tagjump.vim +++ b/src/nvim/testdir/test_tagjump.vim @@ -170,7 +170,7 @@ func Test_tag_symbolic() call assert_equal('Xtest.c', expand('%:t')) call assert_equal(2, col('.')) - set hidden& + set nohidden set tags& enew! call delete('Xtags') diff --git a/src/nvim/testdir/test_window_cmd.vim b/src/nvim/testdir/test_window_cmd.vim index a522705238..039de0c623 100644 --- a/src/nvim/testdir/test_window_cmd.vim +++ b/src/nvim/testdir/test_window_cmd.vim @@ -608,7 +608,7 @@ func Test_window_prevwin() " reset q call delete('tmp.txt') - set hidden&vim autoread&vim + set nohidden autoread&vim delfunc Fun_RenewFile endfunc -- cgit