From abb0928dfbf71d5358b56e888db9ed8ff66d8933 Mon Sep 17 00:00:00 2001 From: Anmol Sethi Date: Mon, 8 Aug 2016 01:23:12 -0400 Subject: man.vim: handle empty identifier from mapping (#5187) Regression from #5168. Also changed the Man command's nargs to '+' so that man#open_page does not need to handle 0 arguments, because that will never occur. --- runtime/autoload/man.vim | 7 ++++--- runtime/plugin/man.vim | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/runtime/autoload/man.vim b/runtime/autoload/man.vim index a3632a10c3..6c2d4eae8e 100644 --- a/runtime/autoload/man.vim +++ b/runtime/autoload/man.vim @@ -30,10 +30,11 @@ function! man#open_page(count, count1, ...) abort if a:0 > 2 call s:error('too many arguments') return - elseif a:0 ==# 0 - call s:error('missing argument') - return elseif a:0 ==# 1 + if empty(a:1) + call s:error('no identifier under cursor') + return + endif let ref = a:1 else " We combine the name and sect into a manpage reference so that all diff --git a/runtime/plugin/man.vim b/runtime/plugin/man.vim index 12762f1854..b60c98abb8 100644 --- a/runtime/plugin/man.vim +++ b/runtime/plugin/man.vim @@ -5,7 +5,7 @@ if exists('g:loaded_man') endif let g:loaded_man = 1 -command! -count=0 -complete=customlist,man#complete -nargs=* Man call man#open_page(v:count, v:count1, ) +command! -count=0 -complete=customlist,man#complete -nargs=+ Man call man#open_page(v:count, v:count1, ) nnoremap (Man) :call man#open_page(v:count, v:count1, &filetype ==# 'man' ? expand('') : expand('')) -- cgit