diff options
| -rw-r--r-- | runtime/doc/options.txt | 6 | ||||
| -rw-r--r-- | runtime/doc/vim_diff.txt | 4 | ||||
| -rw-r--r-- | runtime/lua/vim/_meta/options.lua | 4 | ||||
| -rw-r--r-- | src/nvim/options.lua | 6 | ||||
| -rw-r--r-- | test/old/testdir/test_modeline.vim | 2 | ||||
| -rw-r--r-- | test/old/testdir/test_statusline.vim | 21 |
6 files changed, 28 insertions, 15 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index b2a020cf9d..d92e528214 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -2521,10 +2521,8 @@ A jump table for the options with a short description can be found at |Q_op|. default to single-byte alternatives. Example: > - :set fillchars=stl:^,stlnc:=,vert:│,fold:·,diff:- -< This is similar to the default, except that these characters will also - be used when there is highlighting. - + :set fillchars=stl:\ ,stlnc:\ ,vert:│,fold:·,diff:- +< For the "stl", "stlnc", "foldopen", "foldclose" and "foldsep" items single-byte and multibyte characters are supported. But double-width characters are not supported. diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt index efebf46d85..1e12ccd7cc 100644 --- a/runtime/doc/vim_diff.txt +++ b/runtime/doc/vim_diff.txt @@ -550,10 +550,6 @@ Vimscript compatibility: `shell_error` does not alias to |v:shell_error| `this_session` does not alias to |v:this_session| -UI/Display: - 'statusline' always uses the "stl" and "stlnc" fields of 'fillchars', even - if they are the same and |hl-StatusLine| and |hl-StatusLineNC| are equal. - Working directory (Vim implemented some of these after Nvim): - |DirChanged| and |DirChangedPre| can be triggered when switching to another window or tab. diff --git a/runtime/lua/vim/_meta/options.lua b/runtime/lua/vim/_meta/options.lua index a986cd752c..53f7166b3d 100644 --- a/runtime/lua/vim/_meta/options.lua +++ b/runtime/lua/vim/_meta/options.lua @@ -2217,10 +2217,8 @@ vim.bo.ft = vim.bo.filetype --- --- Example: --- ``` ---- :set fillchars=stl:^,stlnc:=,vert:│,fold:·,diff:- +--- :set fillchars=stl:\ ,stlnc:\ ,vert:│,fold:·,diff:- --- ``` ---- This is similar to the default, except that these characters will also ---- be used when there is highlighting. --- --- For the "stl", "stlnc", "foldopen", "foldclose" and "foldsep" items --- single-byte and multibyte characters are supported. But double-width diff --git a/src/nvim/options.lua b/src/nvim/options.lua index c244b83c9e..47cb8e7912 100644 --- a/src/nvim/options.lua +++ b/src/nvim/options.lua @@ -2851,10 +2851,8 @@ return { default to single-byte alternatives. Example: > - :set fillchars=stl:^,stlnc:=,vert:│,fold:·,diff:- - < This is similar to the default, except that these characters will also - be used when there is highlighting. - + :set fillchars=stl:\ ,stlnc:\ ,vert:│,fold:·,diff:- + < For the "stl", "stlnc", "foldopen", "foldclose" and "foldsep" items single-byte and multibyte characters are supported. But double-width characters are not supported. diff --git a/test/old/testdir/test_modeline.vim b/test/old/testdir/test_modeline.vim index 613722fdbd..487a89e038 100644 --- a/test/old/testdir/test_modeline.vim +++ b/test/old/testdir/test_modeline.vim @@ -172,6 +172,8 @@ func Test_modeline_colon() endfunc func s:modeline_fails(what, text, error) + " Don't use CheckOption(), it would skip the whole test + " just for a single un-supported option if !exists('+' .. a:what) return endif diff --git a/test/old/testdir/test_statusline.vim b/test/old/testdir/test_statusline.vim index fccfd46966..c48bac12b4 100644 --- a/test/old/testdir/test_statusline.vim +++ b/test/old/testdir/test_statusline.vim @@ -617,4 +617,25 @@ func Test_statusline_showcmd() call StopVimInTerminal(buf) endfunc +func Test_statusline_highlight_group_cleared() + CheckScreendump + + " the laststatus option is there to prevent + " the code-style test from complaining about + " trailing whitespace + let lines =<< trim END + set fillchars=stl:\ ,stlnc:\ laststatus=2 + split + hi clear StatusLine + hi clear StatusLineNC + END + call writefile(lines, 'XTest_statusline_stl', 'D') + + let buf = RunVimInTerminal('-S XTest_statusline_stl', {}) + + call VerifyScreenDump(buf, 'Test_statusline_stl_1', {}) + + call StopVimInTerminal(buf) +endfunc + " vim: shiftwidth=2 sts=2 expandtab |