Commit | Line | Data |
---|---|---|
461290e2 FF |
1 | diff -u -r ../neovim-0851057a8deaa1197bd0af22babb62c1146d836c/runtime/autoload/man.vim ./runtime/autoload/man.vim |
2 | --- ../neovim-0851057a8deaa1197bd0af22babb62c1146d836c/runtime/autoload/man.vim 2018-02-04 12:54:30.000000000 +0000 | |
3 | +++ ./runtime/autoload/man.vim 2018-02-05 00:48:37.422608665 +0000 | |
4 | @@ -149,7 +149,7 @@ | |
ce86c98e | 5 | " Force MANPAGER=cat to ensure Vim is not recursively invoked (by man-db). |
64d68be9 | 6 | " http://comments.gmane.org/gmane.editors.vim.devel/29085 |
461290e2 FF |
7 | " Set MAN_KEEP_FORMATTING so Debian man doesn't discard backspaces. |
8 | - let cmd = ['env', 'MANPAGER=cat', 'MANWIDTH='.manwidth, 'MAN_KEEP_FORMATTING=1', 'man'] | |
9 | + let cmd = ['env', 'MANPAGER=cat', 'MANWIDTH='.manwidth, 'MAN_KEEP_FORMATTING=1', 'mandoc'] | |
5469d363 | 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)' |