-diff -u -r ../neovim-a062cd4ce58ba9aca6fdce443b014c9c0949ecde/runtime/autoload/man.vim ./runtime/autoload/man.vim
---- ../neovim-a062cd4ce58ba9aca6fdce443b014c9c0949ecde/runtime/autoload/man.vim 2017-01-16 23:18:19.000000000 +0100
-+++ ./runtime/autoload/man.vim 2017-01-17 15:48:11.420879618 +0100
-@@ -117,7 +117,7 @@
- let manwidth = empty($MANWIDTH) ? winwidth(0) : $MANWIDTH
+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
-- return s:system(['env', 'MANPAGER=cat', 'MANWIDTH='.manwidth, 'man', a:path])
-+ return s:system(['env', 'MANPAGER=cat', 'MANWIDTH='.manwidth, 'mandoc', a:path])
+ " 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
- function! s:put_page(page) abort
-@@ -156,7 +156,9 @@
+@@ -213,7 +213,9 @@
function! s:get_path(sect, name) abort
if empty(a:sect)
-- return s:system(['man', s:man_find_arg, a:name])
+- 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:man_find_arg, a:name]), "\n")[0] . "\n"
++ return split(s:system(['man', s:find_arg, a:name]), "\n")[0] . "\n"
endif
" '-s' flag handles:
" - tokens like 'printf(echo)'