You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 

23 lines
1.2 KiB

diff -u -r ../neovim-0851057a8deaa1197bd0af22babb62c1146d836c/runtime/autoload/man.vim ./runtime/autoload/man.vim
--- ../neovim-0851057a8deaa1197bd0af22babb62c1146d836c/runtime/autoload/man.vim 2018-02-04 12:54:30.000000000 +0000
+++ ./runtime/autoload/man.vim 2018-02-05 00:48:37.422608665 +0000
@@ -149,7 +149,7 @@
" 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.
- let cmd = ['env', 'MANPAGER=cat', 'MANWIDTH='.manwidth, 'MAN_KEEP_FORMATTING=1', 'man']
+ let cmd = ['env', 'MANPAGER=cat', 'MANWIDTH='.manwidth, 'MAN_KEEP_FORMATTING=1', 'mandoc']
return s:system(cmd + (s:localfile_arg ? ['-l', a:path] : [a:path]))
endfunction
@@ -213,7 +213,9 @@
function! s:get_path(sect, name) abort
if empty(a:sect)
- return s:system(['man', s:find_arg, a:name])
+ " Take the first one if multiple lines returned, such as when
+ " both man1p/test.1p and man1/test.1 exists.
+ return split(s:system(['man', s:find_arg, a:name]), "\n")[0] . "\n"
endif
" '-s' flag handles:
" - tokens like 'printf(echo)'