diff options
| author | James McCoy <jamessan@jamessan.com> | 2020-12-04 18:36:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-04 18:36:54 -0500 |
| commit | b940cbb85875d4dce8dd20620b093be5a9b66283 (patch) | |
| tree | f38b2b350d24696649974dc2d63a8501942f1ae6 | |
| parent | 0c8d6ab536ec2e8e95c0de441e6ad1fdfccc909f (diff) | |
| parent | ba2e94d223d6cf4bd2594f6f2b2bfeb2aaa29368 (diff) | |
| download | rneovim-b940cbb85875d4dce8dd20620b093be5a9b66283.tar.gz rneovim-b940cbb85875d4dce8dd20620b093be5a9b66283.tar.bz2 rneovim-b940cbb85875d4dce8dd20620b093be5a9b66283.zip | |
Merge pull request #13417 from shade-of-noon/man_count.13411
runtime: Fix man.vim count handling.
| -rw-r--r-- | runtime/autoload/man.vim | 6 | ||||
| -rw-r--r-- | runtime/plugin/man.vim | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/runtime/autoload/man.vim b/runtime/autoload/man.vim index 486ed99e3f..99d8c41dba 100644 --- a/runtime/autoload/man.vim +++ b/runtime/autoload/man.vim @@ -18,7 +18,7 @@ function! man#init() abort endtry endfunction -function! man#open_page(count, count1, mods, ...) abort +function! man#open_page(count, mods, ...) abort if a:0 > 2 call s:error('too many arguments') return @@ -39,9 +39,7 @@ function! man#open_page(count, count1, mods, ...) abort endif try let [sect, name] = s:extract_sect_and_name_ref(ref) - if a:count ==# a:count1 - " v:count defaults to 0 which is a valid section, and v:count1 defaults to - " 1, also a valid section. If they are equal, count explicitly set. + if a:count >= 0 let sect = string(a:count) endif let path = s:verify_exists(sect, name) diff --git a/runtime/plugin/man.vim b/runtime/plugin/man.vim index e762eb3664..689aa32ef3 100644 --- a/runtime/plugin/man.vim +++ b/runtime/plugin/man.vim @@ -5,9 +5,9 @@ if exists('g:loaded_man') endif let g:loaded_man = 1 -command! -bang -bar -range=0 -complete=customlist,man#complete -nargs=* Man +command! -bang -bar -range=-1 -complete=customlist,man#complete -nargs=* Man \ if <bang>0 | set ft=man | - \ else | call man#open_page(v:count, v:count1, <q-mods>, <f-args>) | endif + \ else | call man#open_page(<count>, <q-mods>, <f-args>) | endif augroup man autocmd! |