Permalink
Browse files

Don't clobber v_s map

  • Loading branch information...
1 parent 440dc59 commit 6f0984a5ca1430047fe760fc680c6cf98ae94b01 @tpope committed Oct 6, 2011
Showing with 3 additions and 1 deletion.
  1. +3 −1 plugin/surround.vim
View
4 plugin/surround.vim
@@ -551,7 +551,9 @@ if !exists("g:surround_no_mappings") || ! g:surround_no_mappings
nmap ySS <Plug>YSsurround
xmap S <Plug>VSurround
xmap gS <Plug>VgSurround
- xnoremap <silent> s :<C-U>echoerr 'surround.vim: Visual mode s has been removed in favor of S'<CR>
+ if maparg('s', 'x') ==# ''
+ xnoremap <silent> s :<C-U>echoerr 'surround.vim: Visual mode s has been removed in favor of S'<CR>
+ endif
if !hasmapto("<Plug>Isurround","i") && "" == mapcheck("<C-S>","i")
imap <C-S> <Plug>Isurround
endif

0 comments on commit 6f0984a

Please sign in to comment.