mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-11-07 11:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

man.vim: more robust s:verify_exists #6043

Browse Source 
Closes #6039

Also: close the window if we could not get the page from man but only if
we opened it ourselves.
This commit is contained in:
Anmol Sethi
2017-02-01 15:12:52 -05:00
committed by Justin M. Keyes
parent 6d4e08d226
commit 3d3b1641d0
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
runtime/autoload/man.vim
View File

@@ -55,7 +55,10 @@ function! man#open_page(count, count1, mods, ...) abort
try try
let page = s:get_page(path) let page = s:get_page(path)
catch catch
if a:mods =~# 'tab' || !s:find_man()
" a new window was opened
close close
endif
call s:error(v:exception) call s:error(v:exception)
return return
endtry endtry
@@ -175,13 +178,15 @@ function! s:get_path(sect, name) abort
endfunction endfunction
function! s:verify_exists(sect, name) abort function! s:verify_exists(sect, name) abort
try
let path = s:get_path(a:sect, a:name) let path = s:get_path(a:sect, a:name)
if path !~# '^\/' catch /^command error (/
try
let path = s:get_path(get(b:, 'man_default_sects', ''), a:name) let path = s:get_path(get(b:, 'man_default_sects', ''), a:name)
if path !~# '^\/' catch /^command error (/
let path = s:get_path('', a:name) let path = s:get_path('', a:name)
endif endtry
endif endtry
" We need to extract the section from the path because sometimes " We need to extract the section from the path because sometimes
" the actual section of the manpage is more specific than the section " the actual section of the manpage is more specific than the section
" we provided to `man`. Try ':Man 3 App::CLI'. " we provided to `man`. Try ':Man 3 App::CLI'.