diff -r 9bbbe05aaac3 runtime/ftplugin/ocaml.vim
--- a/runtime/ftplugin/ocaml.vim	Mon Jul 22 00:33:53 2013 +0900
+++ b/runtime/ftplugin/ocaml.vim	Wed Jul 24 22:34:06 2013 +0900
@@ -54,7 +54,7 @@
   xnoremap <buffer> <Plug>BUncomOn <ESC>:'<,'><CR>`<O<ESC>0i(*<ESC>`>o<ESC>0i*)<ESC>`<
   xnoremap <buffer> <Plug>BUncomOff <ESC>:'<,'><CR>`<dd`>dd`<
 
-  nmap <buffer> <LocalLeader>s <Plug>OCamlSwitch
+  nmap <buffer> <LocalLeader>s <Plug>OCamlSwitchEdit
   nmap <buffer> <LocalLeader>S <Plug>OCamlSwitchNewWin
 
   nmap <buffer> <LocalLeader>t <Plug>OCamlPrintType
@@ -75,7 +75,7 @@
 " switching between interfaces (.mli) and implementations (.ml)
 if !exists("g:did_ocaml_switch")
   let g:did_ocaml_switch = 1
-  nnoremap <Plug>OCamlSwitch :<C-u>call OCaml_switch(0)<CR>
+  nnoremap <Plug>OCamlSwitchEdit :<C-u>call OCaml_switch(0)<CR>
   nnoremap <Plug>OCamlSwitchNewWin :<C-u>call OCaml_switch(1)<CR>
   fun OCaml_switch(newwin)
     if (match(bufname(""), "\\.mli$") >= 0)