diff options
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/autoload/man.vim | 4 | ||||
| -rw-r--r-- | runtime/doc/nvim.txt | 6 | ||||
| -rw-r--r-- | runtime/doc/options.txt | 14 | ||||
| -rw-r--r-- | runtime/doc/syntax.txt | 2 |
4 files changed, 21 insertions, 5 deletions
diff --git a/runtime/autoload/man.vim b/runtime/autoload/man.vim index c49c550b20..f5b863a899 100644 --- a/runtime/autoload/man.vim +++ b/runtime/autoload/man.vim @@ -135,7 +135,9 @@ function! s:get_page(path) abort let manwidth = empty($MANWIDTH) ? winwidth(0) : $MANWIDTH " Force MANPAGER=cat to ensure Vim is not recursively invoked (by man-db). " http://comments.gmane.org/gmane.editors.vim.devel/29085 - return s:system(['env', 'MANPAGER=cat', 'MANWIDTH='.manwidth, 'man', a:path]) + let cmd = ['env', 'MANPAGER=cat', 'MANWIDTH='.manwidth, 'man'] + " Use -l everywhere except macOS. #6683 + return s:system(cmd + (has('mac') ? [a:path] : ['-l', a:path])) endfunction function! s:put_page(page) abort diff --git a/runtime/doc/nvim.txt b/runtime/doc/nvim.txt index 2256791ec4..29059f83d9 100644 --- a/runtime/doc/nvim.txt +++ b/runtime/doc/nvim.txt @@ -18,10 +18,10 @@ differences from Vim. ============================================================================== Transitioning from Vim *nvim-from-vim* -To start the transition, create `~/.config/nvim/init.vim` with these contents: +To start the transition, create ~/.config/nvim/init.vim with these contents: > - set runtimepath+=~/.vim,~/.vim/after - set packpath+=~/.vim + set runtimepath^=~/.vim runtimepath+=~/.vim/after + let &packpath = &runtimepath source ~/.vimrc < Note: If your system sets `$XDG_CONFIG_HOME`, use that instead of `~/.config` diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt index e72241518c..afc7c20ed5 100644 --- a/runtime/doc/options.txt +++ b/runtime/doc/options.txt @@ -3128,7 +3128,8 @@ A jump table for the options with a short description can be found at |Q_op|. use for that occasion. The occasions are: |hl-SpecialKey| 8 Meta and special keys listed with ":map" |hl-Whitespace| 0 - |hl-EndOfBuffer| ~ lines after the last line in the buffer + |hl-EndOfBuffer| ~ lines after the last line in the buffer + |hl-NormalNC| I non-current ("inactive") window |hl-TermCursor| z Cursor in a focused terminal |hl-TermCursorNC| Z Cursor in an unfocused terminal |hl-NonText| @ '@' at the end of the window and @@ -6843,6 +6844,17 @@ A jump table for the options with a short description can be found at |Q_op|. 'winheight' applies to the current window. Use 'winminheight' to set the minimal height for other windows. + *'winhighlight'* *'winhl'* +'winhighlight' 'winhl' string (default empty) + local to window + Window-local highlights. Comma-delimited list of |group-name| pairs + "{hl-builtin}:{hl-group},..." where each {hl-builtin} is a group (from + |highlight-groups|) to be overridden by {hl-group} in the window where + this option was set. + Currently |hl-Normal| and |hl-NormalNC| can be overridden. + Useful for changing the background color. Example: > + set winhighlight=Normal:MyNormal,NormalNC:MyNormalNC +< *'winfixheight'* *'wfh'* *'nowinfixheight'* *'nowfh'* 'winfixheight' 'wfh' boolean (default off) local to window diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt index a45fa3096a..18920d81e3 100644 --- a/runtime/doc/syntax.txt +++ b/runtime/doc/syntax.txt @@ -4922,6 +4922,8 @@ NonText '@' at the end of the window, characters from 'showbreak' fit at the end of the line). See also |hl-EndOfBuffer|. *hl-Normal* Normal normal text + *hl-NormalNC* +NormalNC normal text in non-current window *hl-Pmenu* Pmenu Popup menu: normal item. *hl-PmenuSel* |