diff options
| author | Doron Behar <doron.behar@gmail.com> | 2018-09-20 18:44:48 +0300 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-09-21 10:17:37 +0200 |
| commit | 9081cad514d27ed67f0e348e9db56eddb296cc1d (patch) | |
| tree | a7a600bb21cbf7751cbee5c63fc2f3bc91026a59 | |
| parent | ad6bbe44683cf936ec2268ee89e8e1c22f538ecc (diff) | |
| download | rneovim-9081cad514d27ed67f0e348e9db56eddb296cc1d.tar.gz rneovim-9081cad514d27ed67f0e348e9db56eddb296cc1d.tar.bz2 rneovim-9081cad514d27ed67f0e348e9db56eddb296cc1d.zip | |
man.vim: Ignore $MANWIDTH, use soft wrap #9023
fix #9017
close #9023
| -rw-r--r-- | runtime/autoload/man.vim | 5 | ||||
| -rw-r--r-- | runtime/ftplugin/man.vim | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/runtime/autoload/man.vim b/runtime/autoload/man.vim index 7385862c0b..69bdcd30e1 100644 --- a/runtime/autoload/man.vim +++ b/runtime/autoload/man.vim @@ -149,8 +149,9 @@ function! s:system(cmd, ...) abort endfunction function! s:get_page(path) abort - " Respect $MANWIDTH or default to window width. - let manwidth = empty($MANWIDTH) ? winwidth(0) : $MANWIDTH + " Disable hard-wrap by setting $MANWIDTH to a high value. + " Use soft wrap instead (ftplugin/man.vim sets 'wrap', 'breakindent'). + let manwidth = 9999 " Force MANPAGER=cat to ensure Vim is not recursively invoked (by man-db). " http://comments.gmane.org/gmane.editors.vim.devel/29085 " Set MAN_KEEP_FORMATTING so Debian man doesn't discard backspaces. diff --git a/runtime/ftplugin/man.vim b/runtime/ftplugin/man.vim index 68ebb33e45..26b51186a1 100644 --- a/runtime/ftplugin/man.vim +++ b/runtime/ftplugin/man.vim @@ -22,6 +22,8 @@ setlocal noexpandtab setlocal tabstop=8 setlocal softtabstop=8 setlocal shiftwidth=8 +setlocal wrap +setlocal breakindent setlocal nonumber setlocal norelativenumber @@ -31,6 +33,8 @@ setlocal nolist setlocal nofoldenable if !exists('g:no_plugin_maps') && !exists('g:no_man_maps') + nnoremap <silent> <buffer> j gj + nnoremap <silent> <buffer> k gk nnoremap <silent> <buffer> gO :call man#show_toc()<CR> nnoremap <silent> <buffer> <C-]> :Man<CR> nnoremap <silent> <buffer> K :Man<CR> |