From 6f0984a5ca1430047fe760fc680c6cf98ae94b01 Mon Sep 17 00:00:00 2001
From: Tim Pope <code@tpope.net>
Date: Thu, 6 Oct 2011 18:15:49 -0400
Subject: [PATCH] Don't clobber v_s map

---
 plugin/surround.vim | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugin/surround.vim b/plugin/surround.vim
index a09df31..71da7a1 100644
--- a/plugin/surround.vim
+++ b/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