Discard numerical argument for ys and yS

This commit is contained in:
Tim Pope 2006-11-06 05:53:09 +00:00
parent dd236914cf
commit 1e4cf6f319

View File

@ -691,10 +691,11 @@ endfunction " }}}1
nnoremap <silent> <Plug>Dsurround :<C-U>call <SID>dosurround(<SID>inputtarget())<CR>
nnoremap <silent> <Plug>Csurround :<C-U>call <SID>changesurround()<CR>
nnoremap <silent> <Plug>Ysurround :set opfunc=<SID>opfunc<CR>g@
nnoremap <silent> <Plug>YSurround :set opfunc=<SID>opfunc2<CR>g@
nnoremap <silent> <Plug>Yssurround :<C-U>call <SID>opfunc(v:count1)<CR>
nnoremap <silent> <Plug>YSsurround :<C-U>call <SID>opfunc2(v:count1)<CR>
" <C-U> discards the numerical argument but there's not much we can do with it
nnoremap <silent> <Plug>Ysurround :<C-U>set opfunc=<SID>opfunc<CR>g@
nnoremap <silent> <Plug>YSurround :<C-U>set opfunc=<SID>opfunc2<CR>g@
vnoremap <silent> <Plug>Vsurround :<C-U>call <SID>opfunc(visualmode())<CR>
vnoremap <silent> <Plug>VSurround :<C-U>call <SID>opfunc2(visualmode())<CR>
inoremap <silent> <Plug>Isurround <C-R>=<SID>insert()<CR>
@ -714,7 +715,7 @@ if !exists("g:surround_no_mappings") || ! g:surround_no_mappings
if !hasmapto("<Plug>VSurround","v")
vmap S <Plug>VSurround
endif
if !hasmapto("<Plug>Isurround","i")
if !hasmapto("<Plug>Isurround","i") && !mapcheck("<C-S>","i")
imap <C-S> <Plug>Isurround
endif
"Implemented internally instead