aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGregory Anders <greg@gpanders.com>2021-08-17 12:12:47 -0600
committerGregory Anders <greg@gpanders.com>2021-08-17 16:39:04 -0600
commitd417e67e595a9eb19797866e91bb80b4fe299a94 (patch)
tree15b0f537d8ffd15b4603ec6addfedf4948b71023 /src
parentf6c72b745cfbaaba80555de9a5d4b25f30f17ab2 (diff)
downloadrneovim-d417e67e595a9eb19797866e91bb80b4fe299a94.tar.gz
rneovim-d417e67e595a9eb19797866e91bb80b4fe299a94.tar.bz2
rneovim-d417e67e595a9eb19797866e91bb80b4fe299a94.zip
feat(defaults): set nojoinspaces
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_join.vim2
3 files changed, 4 insertions, 1 deletions
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