Fredrik Fornwall
8 years ago
2 changed files with 18 additions and 16 deletions
@ -1,23 +1,23 @@ |
|||||
diff -u -r ../neovim-a062cd4ce58ba9aca6fdce443b014c9c0949ecde/runtime/autoload/man.vim ./runtime/autoload/man.vim
|
diff -u -r ../neovim-1b2acb8d958c1c8e2f382c2de9c98586801fd9fe/runtime/autoload/man.vim ./runtime/autoload/man.vim
|
||||
--- ../neovim-a062cd4ce58ba9aca6fdce443b014c9c0949ecde/runtime/autoload/man.vim 2017-01-16 23:18:19.000000000 +0100
|
--- ../neovim-1b2acb8d958c1c8e2f382c2de9c98586801fd9fe/runtime/autoload/man.vim 2017-06-03 21:00:05.000000000 +0200
|
||||
+++ ./runtime/autoload/man.vim 2017-01-17 15:48:11.420879618 +0100
|
+++ ./runtime/autoload/man.vim 2017-06-05 01:15:56.254306768 +0200
|
||||
@@ -117,7 +117,7 @@
|
@@ -148,7 +148,7 @@
|
||||
let manwidth = empty($MANWIDTH) ? winwidth(0) : $MANWIDTH |
let manwidth = empty($MANWIDTH) ? winwidth(0) : $MANWIDTH |
||||
" Force MANPAGER=cat to ensure Vim is not recursively invoked (by man-db). |
" Force MANPAGER=cat to ensure Vim is not recursively invoked (by man-db). |
||||
" http://comments.gmane.org/gmane.editors.vim.devel/29085 |
" http://comments.gmane.org/gmane.editors.vim.devel/29085 |
||||
- return s:system(['env', 'MANPAGER=cat', 'MANWIDTH='.manwidth, 'man', a:path])
|
- let cmd = ['env', 'MANPAGER=cat', 'MANWIDTH='.manwidth, 'man']
|
||||
+ return s:system(['env', 'MANPAGER=cat', 'MANWIDTH='.manwidth, 'mandoc', a:path])
|
+ let cmd = ['env', 'MANPAGER=cat', 'MANWIDTH='.manwidth, 'mandoc']
|
||||
|
return s:system(cmd + (s:localfile_arg ? ['-l', a:path] : [a:path])) |
||||
endfunction |
endfunction |
||||
|
|
||||
function! s:put_page(page) abort |
@@ -213,7 +213,9 @@
|
||||
@@ -156,7 +156,9 @@
|
|
||||
|
|
||||
function! s:get_path(sect, name) abort |
function! s:get_path(sect, name) abort |
||||
if empty(a:sect) |
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
|
+ " Take the first one if multiple lines returned, such as when
|
||||
+ " both man1p/test.1p and man1/test.1 exists.
|
+ " 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 |
endif |
||||
" '-s' flag handles: |
" '-s' flag handles: |
||||
" - tokens like 'printf(echo)' |
" - tokens like 'printf(echo)' |
||||
|
Loading…
Reference in new issue