-diff -u -r ../neovim-09c58f721ba64ce0e6e1b5d0f2b6291ec9a6555f/runtime/autoload/man.vim ./runtime/autoload/man.vim
---- ../neovim-09c58f721ba64ce0e6e1b5d0f2b6291ec9a6555f/runtime/autoload/man.vim 2016-07-13 12:09:26.000000000 -0400
-+++ ./runtime/autoload/man.vim 2016-08-04 11:23:49.834834852 -0400
-@@ -73,7 +73,7 @@
- if empty($MANWIDTH)
- let $MANWIDTH = winwidth(0)
- endif
-- silent exec 'r!/usr/bin/man '.s:cmd(sect, page).' | col -b'
-+ silent exec 'r!man '.s:cmd(sect, page).' | col -b | uniq'
- " Remove blank lines from top and bottom.
- while getline(1) =~# '^\s*$'
- silent keepjumps 1delete _
-@@ -132,6 +132,6 @@
+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
- function s:find_page(sect, page) abort
-- let where = system('/usr/bin/man '.s:man_find_arg.' '.s:cmd(a:sect, a:page))
-+ let where = system('man '.s:man_find_arg.' '.s:cmd(a:sect, a:page))
- return (where =~# '^ */')
- 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)'