diff options
author | Björn Linse <bjorn.linse@gmail.com> | 2018-06-14 18:00:59 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-06-14 18:00:59 +0200 |
commit | c46997aa8744f88e9886022dab703157c101cff7 (patch) | |
tree | ea9dafd38264c3e8b3c0e8c1449f13d7baabd79b /runtime | |
parent | f27a665e0515c280e1fa6c999f29921eb882c6b2 (diff) | |
parent | 5442f0b6221946e482dec2cb82576f0ba38900fe (diff) | |
download | rneovim-c46997aa8744f88e9886022dab703157c101cff7.tar.gz rneovim-c46997aa8744f88e9886022dab703157c101cff7.tar.bz2 rneovim-c46997aa8744f88e9886022dab703157c101cff7.zip |
Merge pull request #8546 from bfredl/eob
Add fillchar for EndOfBuffer and check for invalid UTF-8
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/doc/options.txt | 2 | ||||
-rw-r--r-- | runtime/doc/vim_diff.txt | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index 3bc248c795..f924003e1f 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -2393,6 +2393,7 @@ A jump table for the options with a short description can be found at |Q_op|. fold:c '·' or '-' filling 'foldtext' diff:c '-' deleted lines of the 'diff' option msgsep:c ' ' message separator 'display' + eob:c '~' empty lines at the end of a buffer 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 '=' @@ -2415,6 +2416,7 @@ A jump table for the options with a short description can be found at |Q_op|. vert:c VertSplit |hl-VertSplit| fold:c Folded |hl-Folded| diff:c DiffDelete |hl-DiffDelete| + eob:c EndOfBuffer |hl-EndOfBuffer| *'fixendofline'* *'fixeol'* *'nofixendofline'* *'nofixeol'* 'fixendofline' 'fixeol' boolean (default on) diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt index 9dd03079fe..5394414947 100644 --- a/runtime/doc/vim_diff.txt +++ b/runtime/doc/vim_diff.txt @@ -180,7 +180,8 @@ Options: 'cpoptions' flags: |cpo-_| 'display' flag `msgsep` to minimize scrolling when showing messages 'guicursor' works in the terminal - 'fillchars' flag `msgsep` (see 'display' above) + 'fillchars' flags: `msgsep` (see 'display' above) + and `eob` for |EndOfBuffer| marker 'inccommand' shows interactive results for |:substitute|-like commands 'scrollback' 'statusline' supports unlimited alignment sections |