diff options
| author | Marco Hinz <mh.codebro+github@gmail.com> | 2019-01-28 00:45:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-28 00:45:59 +0100 |
| commit | 28f87c505d895df8d00a919f6324f5305f02166e (patch) | |
| tree | 3a642b40f51833605b14a0184d968dae4bb2cdfe /runtime | |
| parent | 7e6980a161011ab58c69ee67f35522fd86e6cb25 (diff) | |
| parent | 88b0899eb40581ad5b8071823594852a7cdf2043 (diff) | |
| download | rneovim-28f87c505d895df8d00a919f6324f5305f02166e.tar.gz rneovim-28f87c505d895df8d00a919f6324f5305f02166e.tar.bz2 rneovim-28f87c505d895df8d00a919f6324f5305f02166e.zip | |
Merge #9539 "options: make 'listchars' and 'fillchars' local to window"
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/doc/options.txt | 27 | ||||
| -rw-r--r-- | runtime/doc/vim_diff.txt | 7 |
2 files changed, 25 insertions, 9 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index a26e8faa2c..bf75bebb80 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -3653,7 +3653,7 @@ A jump table for the options with a short description can be found at |Q_op|. *'listchars'* *'lcs'* 'listchars' 'lcs' string (default: "tab:> ,trail:-,nbsp:+" Vi default: "eol:$") - global + local to window Strings to use in 'list' mode and for the |:list| command. It is a comma separated list of string settings. @@ -3662,11 +3662,26 @@ A jump table for the options with a short description can be found at |Q_op|. omitted, there is no extra character at the end of the line. *lcs-tab* - tab:xy Two characters to be used to show a tab. The first - char is used once. The second char is repeated to - fill the space that the tab normally occupies. - "tab:>-" will show a tab that takes four spaces as - ">---". When omitted, a tab is show as ^I. + tab:xy[z] Two or three characters to be used to show a tab. + The third character is optional. + + tab:xy The 'x' is always used, then 'y' as many times as will + fit. Thus "tab:>-" displays: + > + >- + >-- + etc. + + tab:xyz The 'z' is always used, then 'x' is prepended, and + then 'y' is used as many times as will fit. Thus + "tab:<->" displays: + > + <> + <-> + <--> + etc. + + When "tab:" is omitted, a tab is shown as ^I. *lcs-space* space:c Character to show for a space. When omitted, spaces are left blank. diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt index 0e6c682b5c..36630d14ac 100644 --- a/runtime/doc/vim_diff.txt +++ b/runtime/doc/vim_diff.txt @@ -37,8 +37,8 @@ a complete and centralized reference of those differences. - 'display' defaults to "lastline,msgsep" - 'encoding' is UTF-8 (cf. 'fileencoding' for file-content encoding) - 'fillchars' defaults (in effect) to "vert:│,fold:·" -- 'fsync' is disabled - 'formatoptions' defaults to "tcqj" +- 'fsync' is disabled - 'history' defaults to 10000 (the maximum) - 'hlsearch' is set by default - 'incsearch' is set by default @@ -184,9 +184,10 @@ Options: 'cpoptions' flags: |cpo-_| 'display' flag `msgsep` to minimize scrolling when showing messages 'guicursor' works in the terminal - 'fillchars' flags: `msgsep` (see 'display' above) - and `eob` for |hl-EndOfBuffer| marker + 'fillchars' local to window. flags: `msgsep` (see 'display' above) and `eob` + for |hl-EndOfBuffer| marker 'inccommand' shows interactive results for |:substitute|-like commands + 'listchars' local to window 'scrollback' 'statusline' supports unlimited alignment sections 'tabline' %@Func@foo%X can call any function on mouse-click |