diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2018-02-23 01:14:30 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-23 01:14:30 +0100 |
commit | f3f1970597211c784190c4a1e1990d2386ac76a1 (patch) | |
tree | e55c16d1a7d134b091e11df06e36025cc8dd8288 /runtime | |
parent | 15670ca1ad657945f69350b663e127f71f81d51c (diff) | |
parent | 384a39479a0b70abf9cd6ced0b5f1d53cd817c11 (diff) | |
download | rneovim-f3f1970597211c784190c4a1e1990d2386ac76a1.tar.gz rneovim-f3f1970597211c784190c4a1e1990d2386ac76a1.tar.bz2 rneovim-f3f1970597211c784190c4a1e1990d2386ac76a1.zip |
Merge #8035 from justinmk/teto-fillchars-pr
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/doc/options.txt | 11 | ||||
-rw-r--r-- | runtime/doc/vim_diff.txt | 1 |
2 files changed, 8 insertions, 4 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index a1a361fc85..fbc055ddd5 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -2377,7 +2377,7 @@ A jump table for the options with a short description can be found at |Q_op|. Only normal file name characters can be used, "/\*?[|<>" are illegal. *'fillchars'* *'fcs'* -'fillchars' 'fcs' string (default "vert:|,fold:-") +'fillchars' 'fcs' string (default "") global {not available when compiled without the |+windows| and |+folding| features} @@ -2387,16 +2387,19 @@ A jump table for the options with a short description can be found at |Q_op|. item default Used for ~ stl:c ' ' or '^' statusline of the current window stlnc:c ' ' or '=' statusline of the non-current windows - vert:c '|' vertical separators |:vsplit| - fold:c '-' filling 'foldtext' + vert:c '│' or '|' vertical separators |:vsplit| + fold:c '·' or '-' filling 'foldtext' diff:c '-' deleted lines of the 'diff' option Any one that is omitted will fall back to the default. For "stl" and "stlnc" the space will be used when there is highlighting, '^' or '=' otherwise. + If 'ambiwidth' is "double" then "vert" and "fold" default to + single-byte alternatives. + 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. diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt index 7426cd0940..3924dd4ebe 100644 --- a/runtime/doc/vim_diff.txt +++ b/runtime/doc/vim_diff.txt @@ -35,6 +35,7 @@ a complete and centralized reference of those differences. - 'cscopeverbose' is enabled - 'directory' defaults to ~/.local/share/nvim/swap// (|xdg|), auto-created - 'display' defaults to "lastline" +- 'fillchars' defaults (in effect) to "vert:│,fold:·" - 'formatoptions' defaults to "tcqj" - 'history' defaults to 10000 (the maximum) - 'hlsearch' is set by default |