s:MapOp: Remove count argument

tomtom · Apr 26, 2015 · 232e83b · 232e83b
1 parent eee4ff4
commit 232e83b
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/plugin/tcomment.vim b/plugin/tcomment.vim
@@ -162,7 +162,7 @@ noremap <Plug>TComment_<Leader>_s :TCommentAs <c-r>=&ft<cr>_
 "     call call(g:tcomment_op, [a:type])
 " endf
 
-function! s:MapOp(name, count, extra, op, invoke) "{{{3
+function! s:MapOp(name, extra, op, invoke) "{{{3
     let opfunc = 'TCommentOpFunc_'. substitute(a:name, '[^a-zA-Z0-9_]', '_', 'G')
     let fn = [
                 \ 'function! '. opfunc .'(...)',
@@ -179,32 +179,32 @@ function! s:MapOp(name, count, extra, op, invoke) "{{{3
 endf
 
 
-call s:MapOp('Uncomment',  '', 'call tcomment#SetOption("mode_extra", "U")', 'tcomment#Operator', 'g@')
-call s:MapOp('Uncommentc', '', 'call tcomment#SetOption("mode_extra", "U")', 'tcomment#OperatorLine', 'g@$')
-call s:MapOp('Uncommentb', '', 'call tcomment#SetOption("mode_extra", "UB")', 'tcomment#OperatorLine', 'g@')
+call s:MapOp('Uncomment',  'call tcomment#SetOption("mode_extra", "U")', 'tcomment#Operator', 'g@')
+call s:MapOp('Uncommentc', 'call tcomment#SetOption("mode_extra", "U")', 'tcomment#OperatorLine', 'g@$')
+call s:MapOp('Uncommentb', 'call tcomment#SetOption("mode_extra", "UB")', 'tcomment#OperatorLine', 'g@')
 xnoremap <silent> <Plug>TComment_Uncomment :<c-u>if v:count > 0 \| call tcomment#SetOption("count", v:count) \| endif \| call tcomment#SetOption("mode_extra", "U") \| '<,'>TCommentMaybeInline<cr>
 
-call s:MapOp('Comment',  '', '', 'tcomment#OperatorAnyway', 'g@')
-call s:MapOp('Commentc', '', '', 'tcomment#OperatorLineAnyway', 'g@$')
-call s:MapOp('Commentb', '', 'call tcomment#SetOption("mode_extra", "B")', 'tcomment#OperatorLine', 'g@')
+call s:MapOp('Comment',  '', 'tcomment#OperatorAnyway', 'g@')
+call s:MapOp('Commentc', '', 'tcomment#OperatorLineAnyway', 'g@$')
+call s:MapOp('Commentb', 'call tcomment#SetOption("mode_extra", "B")', 'tcomment#OperatorLine', 'g@')
 xnoremap <silent> <Plug>TComment_Comment :<c-u>if v:count > 0 \| call tcomment#SetOption("count", v:count) \| endif \| '<,'>TCommentMaybeInline!<cr>
 
 vnoremap <Plug>TComment_ic :<c-U>call tcomment#TextObjectInlineComment()<cr>
 noremap <Plug>TComment_ic :<c-U>call tcomment#TextObjectInlineComment()<cr>
 
-call s:MapOp('gcc', '', '', 'tcomment#OperatorLine', 'g@$')
-call s:MapOp('gcb', '', 'call tcomment#SetOption("mode_extra", "B")', 'tcomment#OperatorLine', 'g@')
+call s:MapOp('gcc', '', 'tcomment#OperatorLine', 'g@$')
+call s:MapOp('gcb', 'call tcomment#SetOption("mode_extra", "B")', 'tcomment#OperatorLine', 'g@')
 xnoremap <Plug>TComment_gc :TCommentMaybeInline<cr>
 
-call s:MapOp('gc', '', '', 'tcomment#Operator', 'g@')
+call s:MapOp('gc', '', 'tcomment#Operator', 'g@')
 
 for s:i in range(1, 9)
     exec 'noremap <Plug>TComment_<c-_>' . s:i . ' :call tcomment#SetOption("count", '. s:i .')<cr>'
     exec 'inoremap <Plug>TComment_<c-_>' . s:i . ' <c-\><c-o>:call tcomment#SetOption("count", '. s:i .')<cr>'
     exec 'vnoremap <Plug>TComment_<c-_>' . s:i . ' :call tcomment#SetOption("count", '. s:i .')<cr>'
 endfor
 for s:i in range(1, 9)
-    call s:MapOp('gc' . s:i .'c', s:i, '', 'tcomment#Operator', 'g@')
+    call s:MapOp('gc' . s:i .'c', 'call tcomment#SetOption("count", '. s:i .')', 'tcomment#Operator', 'g@')
 endfor
 unlet s:i