diff options
| author | Anmol Sethi <nhooyr@users.noreply.github.com> | 2016-08-08 01:23:12 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-08-08 01:23:12 -0400 |
| commit | abb0928dfbf71d5358b56e888db9ed8ff66d8933 (patch) | |
| tree | 242f357c9868c0e63310065ccd74216d6feffe79 | |
| parent | 6da7d6890cc6e75a5477b0305d7c86501f960cf6 (diff) | |
| download | rneovim-abb0928dfbf71d5358b56e888db9ed8ff66d8933.tar.gz rneovim-abb0928dfbf71d5358b56e888db9ed8ff66d8933.tar.bz2 rneovim-abb0928dfbf71d5358b56e888db9ed8ff66d8933.zip | |
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.
| -rw-r--r-- | runtime/autoload/man.vim | 7 | ||||
| -rw-r--r-- | 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, <f-args>) +command! -count=0 -complete=customlist,man#complete -nargs=+ Man call man#open_page(v:count, v:count1, <f-args>) nnoremap <silent> <Plug>(Man) :<C-U>call man#open_page(v:count, v:count1, &filetype ==# 'man' ? expand('<cWORD>') : expand('<cword>'))<CR> |