DeleteTo command

Author: flatcap

plugin/deleteto.vim

@@ -10,28 +10,37 @@ if (exists ('g:loaded_deleteto') || &cp || (v:version < 700))
 endif
 let g:loaded_deleteto = 1
 
-function! s:delete_to (start, stop, count, char)
+function! s:delete_to (start, stop, char, count)
 let l:esc_char = escape (a:char, '!\')
 let l:cmd = a:start . ',' . a:stop . 's!\V\^\(\[^' . l:esc_char . ']\*' . l:esc_char . '\)\{,' . a:count . '\}!!'
 execute l:cmd
 endfunction
 
-function! s:go (...)
+function! s:go_map (...)
 if (a:0 == 2)
 let [l:start, l:stop] = [a:1, a:2]
 else
 let [l:start, l:stop] = [line ('''['), line (''']')]
 endif
 
 let l:char = nr2char (getchar())
-call s:delete_to (l:start, l:stop, v:count1, l:char)
+call s:delete_to (l:start, l:stop, l:char, v:count1)
+endfunction
+
+function! s:go_command (...)
+if (a:0 == 3)
+let num = 1
+else
+let num = a:4
+endif
+call s:delete_to (a:1, a:2, a:3, num)
 endfunction
 
 function! s:set_up_mappings()
-nnoremap <silent> <Plug>DeleteToA :<C-U>call <SID>go (1, line ('$'))<CR>
-nnoremap <silent> <Plug>DeleteToL :<C-U>call <SID>go (line ('.'), line ('.'))<CR>
-nnoremap <silent> <Plug>DeleteToM :<C-U>set opfunc=<SID>go<CR>g@
-xnoremap <silent> <Plug>DeleteToV :<C-U>call <SID>go (line ('''<'), line ('''>'))<CR>
+nnoremap <silent> <Plug>DeleteToA :<C-U>call <SID>go_map (1, line ('$'))<CR>
+nnoremap <silent> <Plug>DeleteToL :<C-U>call <SID>go_map (line ('.'), line ('.'))<CR>
+nnoremap <silent> <Plug>DeleteToM :<C-U>set opfunc=<SID>go_map<CR>g@
+xnoremap <silent> <Plug>DeleteToV :<C-U>call <SID>go_map (line ('''<'), line ('''>'))<CR>
 
 " Four mappings for the commands
 " DeleteToA all the file
@@ -49,3 +58,5 @@ endfunction
 
 call s:set_up_mappings()
 
+command! -range=% -nargs=+ DeleteTo call <SID>go_command (<line1>, <line2>, <f-args>)
+