defaults: exclude "S" from 'shortmess' #10136

justinmk · web-flow · commit bb24fec33355 · 2019-06-07T23:11:28.000+02:00
ref #6289
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
@@ -5254,7 +5254,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	function to get the effective shiftwidth value.
 
 						*'shortmess'* *'shm'*
-'shortmess' 'shm'	string	(Vim default "filnxtToOFS", Vi default: "S")
+'shortmess' 'shm'	string	(Vim default "filnxtToOF", Vi default: "S")
 			global
 	This option helps to avoid all the |hit-enter| prompts caused by file
 	messages, for example  with CTRL-G, and to avoid some other messages.
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
@@ -51,7 +51,7 @@ the differences.
 - 'nrformats' defaults to "bin,hex"
 - 'ruler' is set by default
 - 'sessionoptions' doesn't include "options"
-- 'shortmess' sets "F" flag
+- 'shortmess' includes "F", excludes "S"
 - 'showcmd' is set by default
 - 'sidescroll' defaults to 1
 - 'smarttab' is set by default
diff --git a/src/nvim/options.lua b/src/nvim/options.lua
@@ -2134,7 +2134,7 @@ return {
       type='string', list='flags', scope={'global'},
       vim=true,
       varname='p_shm',
-      defaults={if_true={vi="S", vim="filnxtToOFS"}}
+      defaults={if_true={vi="S", vim="filnxtToOF"}}
     },
     {
       full_name='showbreak', abbreviation='sbr',
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
@@ -26,7 +26,7 @@ local nvim_prog = (
   or global_helpers.test_build_dir .. '/bin/nvim'
 )
 -- Default settings for the test session.
-local nvim_set  = 'set shortmess+=I background=light noswapfile noautoindent'
+local nvim_set  = 'set shortmess+=IS background=light noswapfile noautoindent'
                   ..' laststatus=1 undodir=. directory=. viewdir=. backupdir=.'
                   ..' belloff= noshowcmd noruler nomore'
 local nvim_argv = {nvim_prog, '-u', 'NONE', '-i', 'NONE',

Original file line number	Diff line number	Diff line change
`@@ -2134,7 +2134,7 @@ return {`
`2134`	`2134`	`type='string', list='flags', scope={'global'},`
`2135`	`2135`	`vim=true,`
`2136`	`2136`	`varname='p_shm',`
`2137`		`- defaults={if_true={vi="S", vim="filnxtToOFS"}}`
	`2137`	`+ defaults={if_true={vi="S", vim="filnxtToOF"}}`
`2138`	`2138`	`},`
`2139`	`2139`	`{`
`2140`	`2140`	`full_name='showbreak', abbreviation='sbr',`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ local nvim_prog = (`
`26`	`26`	`or global_helpers.test_build_dir .. '/bin/nvim'`
`27`	`27`	`)`
`28`	`28`	`-- Default settings for the test session.`
`29`		`-local nvim_set = 'set shortmess+=I background=light noswapfile noautoindent'`
	`29`	`+local nvim_set = 'set shortmess+=IS background=light noswapfile noautoindent'`
`30`	`30`	`..' laststatus=1 undodir=. directory=. viewdir=. backupdir=.'`
`31`	`31`	`..' belloff= noshowcmd noruler nomore'`
`32`	`32`	`local nvim_argv = {nvim_prog, '-u', 'NONE', '-i', 'NONE',`