Commit | Line | Data |
---|---|---|
5469d363 FF |
1 | diff -u -r ../neovim-1b2acb8d958c1c8e2f382c2de9c98586801fd9fe/runtime/autoload/man.vim ./runtime/autoload/man.vim |
2 | --- ../neovim-1b2acb8d958c1c8e2f382c2de9c98586801fd9fe/runtime/autoload/man.vim 2017-06-03 21:00:05.000000000 +0200 | |
3 | +++ ./runtime/autoload/man.vim 2017-06-05 01:15:56.254306768 +0200 | |
4 | @@ -148,7 +148,7 @@ | |
a19f43f2 | 5 | let manwidth = empty($MANWIDTH) ? winwidth(0) : $MANWIDTH |
ce86c98e | 6 | " Force MANPAGER=cat to ensure Vim is not recursively invoked (by man-db). |
64d68be9 | 7 | " http://comments.gmane.org/gmane.editors.vim.devel/29085 |
5469d363 FF |
8 | - let cmd = ['env', 'MANPAGER=cat', 'MANWIDTH='.manwidth, 'man'] |
9 | + let cmd = ['env', 'MANPAGER=cat', 'MANWIDTH='.manwidth, 'mandoc'] | |
10 | return s:system(cmd + (s:localfile_arg ? ['-l', a:path] : [a:path])) | |
64d68be9 FF |
11 | endfunction |
12 | ||
5469d363 | 13 | @@ -213,7 +213,9 @@ |
a19f43f2 FF |
14 | |
15 | function! s:get_path(sect, name) abort | |
16 | if empty(a:sect) | |
5469d363 | 17 | - return s:system(['man', s:find_arg, a:name]) |
a19f43f2 FF |
18 | + " Take the first one if multiple lines returned, such as when |
19 | + " both man1p/test.1p and man1/test.1 exists. | |
5469d363 | 20 | + return split(s:system(['man', s:find_arg, a:name]), "\n")[0] . "\n" |
a19f43f2 FF |
21 | endif |
22 | " '-s' flag handles: | |
23 | " - tokens like 'printf(echo)' |