GitHub/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim synced 2025-07-20 13:22:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(defaults): set nojoinspaces

Browse Source
This commit is contained in:
Gregory Anders
2021-08-17 12:12:47 -06:00
parent f6c72b745c
commit d417e67e59
6 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/doc/options.txt
View File

@ -3498,7 +3498,7 @@ A jump table for the options with a short description can be found at |Q_op|.
|jumplist-stack| |jumplist-stack|
*'joinspaces'* *'js'* *'nojoinspaces'* *'nojs'* *'joinspaces'* *'js'* *'nojoinspaces'* *'nojs'*
'joinspaces' 'js' boolean (default on) 'joinspaces' 'js' boolean (default off)
global global
Insert two spaces after a '.', '?' and '!' with a join command. Insert two spaces after a '.', '?' and '!' with a join command.
Otherwise only one space is inserted. Otherwise only one space is inserted.

1
runtime/doc/vim_diff.txt
View File

@ -45,6 +45,7 @@ the differences.
- 'history' defaults to 10000 (the maximum) - 'history' defaults to 10000 (the maximum)
- 'hlsearch' is enabled - 'hlsearch' is enabled
- 'incsearch' is enabled - 'incsearch' is enabled
- 'joinspaces' is disabled
- 'langnoremap' is enabled - 'langnoremap' is enabled
- 'langremap' is disabled - 'langremap' is disabled
- 'laststatus' defaults to 2 (statusline is always shown) - 'laststatus' defaults to 2 (statusline is always shown)

2
src/nvim/options.lua
View File

@ -1288,7 +1288,7 @@ return {
short_desc=N_("two spaces after a period with a join command"), short_desc=N_("two spaces after a period with a join command"),
type='bool', scope={'global'}, type='bool', scope={'global'},
varname='p_js', varname='p_js',
defaults={if_true=true} defaults={if_true=false}
}, },
{ {
full_name='jumpoptions', abbreviation='jop', full_name='jumpoptions', abbreviation='jop',

1
src/nvim/testdir/setup.vim
View File

@ -12,6 +12,7 @@ set directory^=.
set fillchars=vert:\|,fold:- set fillchars=vert:\|,fold:-
set laststatus=1 set laststatus=1
set listchars=eol:$ set listchars=eol:$
set joinspaces
set nohidden smarttab noautoindent noautoread complete-=i noruler noshowcmd set nohidden smarttab noautoindent noautoread complete-=i noruler noshowcmd
set nrformats+=octal set nrformats+=octal
set shortmess-=F set shortmess-=F

2
src/nvim/testdir/test_join.vim
View File

@ -35,6 +35,7 @@ endfunc
" Tests for setting the '[,'] marks when joining lines. " Tests for setting the '[,'] marks when joining lines.
func Test_join_marks() func Test_join_marks()
set joinspaces
enew enew
call append(0, [ call append(0, [
\ "\t\tO sodales, ludite, vos qui", \ "\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, 11, 0], getpos("'["))
call assert_equal([0, 4, 67, 0], getpos("']")) call assert_equal([0, 4, 67, 0], getpos("']"))
enew! enew!
set nojoinspaces
endfunc endfunc
" Test for joining lines and marks in them " Test for joining lines and marks in them

2
test/functional/helpers.lua
View File

@ -38,7 +38,7 @@ module.nvim_prog = (
module.nvim_set = ( module.nvim_set = (
'set shortmess+=IS background=light noswapfile noautoindent startofline' 'set shortmess+=IS background=light noswapfile noautoindent startofline'
..' laststatus=1 undodir=. directory=. viewdir=. backupdir=.' ..' laststatus=1 undodir=. directory=. viewdir=. backupdir=.'
..' belloff= wildoptions-=pum noshowcmd noruler nomore redrawdebug=invalid') ..' belloff= wildoptions-=pum joinspaces noshowcmd noruler nomore redrawdebug=invalid')
module.nvim_argv = { module.nvim_argv = {
module.nvim_prog, '-u', 'NONE', '-i', 'NONE', module.nvim_prog, '-u', 'NONE', '-i', 'NONE',
'--cmd', module.nvim_set, '--cmd', module.nvim_set,