aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Pilling <robpilling@gmail.com>2020-02-20 20:19:49 +0000
committerJustin M. Keyes <justinkz@gmail.com>2020-02-29 23:44:43 -0800
commit5e0c435ca1b711e80f78429431b4d400d789c618 (patch)
tree1cda9005777fc371d5c6009e9ef1dbdca413032b
parent1b0a7703406328f90edd907880fc4a3dbd1d7087 (diff)
downloadrneovim-5e0c435ca1b711e80f78429431b4d400d789c618.tar.gz
rneovim-5e0c435ca1b711e80f78429431b4d400d789c618.tar.bz2
rneovim-5e0c435ca1b711e80f78429431b4d400d789c618.zip
man.vim: Handle `man` errors when looking for man-paths
Fallback to simply globbing the tag we're given. This matches the original behaviour of `man.vim`, prior to c6afad78d39aa. fixes #11794 closes #11918
-rw-r--r--runtime/autoload/man.vim18
1 files changed, 12 insertions, 6 deletions
diff --git a/runtime/autoload/man.vim b/runtime/autoload/man.vim
index 5feab0ce70..122ae357bc 100644
--- a/runtime/autoload/man.vim
+++ b/runtime/autoload/man.vim
@@ -328,18 +328,24 @@ function! man#complete(arg_lead, cmd_line, cursor_pos) abort
return s:complete(sect, sect, name)
endfunction
-function! s:get_paths(sect, name) abort
+function! s:get_paths(sect, name, do_fallback) abort
+ " callers must try-catch this, as some `man` implementations don't support `s:find_arg`
try
let mandirs = join(split(s:system(['man', s:find_arg]), ':\|\n'), ',')
+ return globpath(mandirs,'man?/'.a:name.'*.'.a:sect.'*', 0, 1)
catch
- call s:error(v:exception)
- return
+ if !a:do_fallback
+ throw v:exception
+ endif
+
+ " fallback to a single path, with the page we're trying to find
+ let [l:sect, l:name, l:path] = s:verify_exists(a:sect, a:name)
+ return [l:path]
endtry
- return globpath(mandirs,'man?/'.a:name.'*.'.a:sect.'*', 0, 1)
endfunction
function! s:complete(sect, psect, name) abort
- let pages = s:get_paths(a:sect, a:name)
+ let pages = s:get_paths(a:sect, a:name, v:false)
" We remove duplicates in case the same manpage in different languages was found.
return uniq(sort(map(pages, 's:format_candidate(v:val, a:psect)'), 'i'))
endfunction
@@ -387,7 +393,7 @@ endfunction
function! man#goto_tag(pattern, flags, info) abort
let [l:sect, l:name] = man#extract_sect_and_name_ref(a:pattern)
- let l:paths = s:get_paths(l:sect, l:name)
+ let l:paths = s:get_paths(l:sect, l:name, v:true)
let l:structured = []
for l:path in l:paths