diff options
| -rw-r--r-- | runtime/doc/options.txt | 2 | ||||
| -rw-r--r-- | runtime/doc/vim_diff.txt | 2 | ||||
| -rw-r--r-- | src/nvim/options.lua | 2 | ||||
| -rw-r--r-- | test/functional/helpers.lua | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 34779541d8..e780dba53c 100644 --- 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 index b7974aa735..fd71067542 100644 --- 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 index 3f28190ec3..96e098778c 100644 --- 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 index e2639f41e7..cf4c7ce9b7 100644 --- 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', |