From 45cfa4a0a16a31fd2a94e6ac7187e452287bbcf2 Mon Sep 17 00:00:00 2001
From: Josh Rahm <rahm@google.com>
Date: Thu, 1 Sep 2022 12:18:37 -0600
Subject: fieldmarshal.vim: use <cmd> instead of :<c-u> to fix some bugs.

---
 plugin/supert.vim | 42 ++++++++++++++++++------------------------
 1 file changed, 18 insertions(+), 24 deletions(-)

(limited to 'plugin/supert.vim')

diff --git a/plugin/supert.vim b/plugin/supert.vim
index c32fc3e..f4a8e85 100644
--- a/plugin/supert.vim
+++ b/plugin/supert.vim
@@ -62,12 +62,6 @@ function! s:do_search_ch(type, vis, ch)
     let pattern = pattern . '\zs\_.\ze'
   endif
 
-  if a:vis == 'v'
-    exec "norm gv"
-  elseif a:vis == 'o'
-    exec "norm v"
-  endif
-
   let i = 0
   while i < v:count1
     call search(pattern, flags)
@@ -75,29 +69,29 @@ function! s:do_search_ch(type, vis, ch)
   endwhile
 endfunction
 
-nnoremap <Plug>(supert-replace-t) :<c-u>call <SID>do_search('t', '')<cr>
-nnoremap <Plug>(supert-replace-T) :<c-u>call <SID>do_search('T', '')<cr>
-nnoremap <Plug>(supert-replace-f) :<c-u>call <SID>do_search('f', '')<cr>
-nnoremap <Plug>(supert-replace-F) :<c-u>call <SID>do_search('F', '')<cr>
+nnoremap <Plug>(supert-replace-t) <cmd>call <SID>do_search('t', '')<cr>
+nnoremap <Plug>(supert-replace-T) <cmd>call <SID>do_search('T', '')<cr>
+nnoremap <Plug>(supert-replace-f) <cmd>call <SID>do_search('f', '')<cr>
+nnoremap <Plug>(supert-replace-F) <cmd>call <SID>do_search('F', '')<cr>
 
-vnoremap <Plug>(supert-replace-t) :<c-u>call <SID>do_search('t', 'v')<cr>
-vnoremap <Plug>(supert-replace-T) :<c-u>call <SID>do_search('T', 'v')<cr>
-vnoremap <Plug>(supert-replace-f) :<c-u>call <SID>do_search('f', 'v')<cr>
-vnoremap <Plug>(supert-replace-F) :<c-u>call <SID>do_search('F', 'v')<cr>
+vnoremap <Plug>(supert-replace-t) <cmd>call <SID>do_search('t', 'v')<cr>
+vnoremap <Plug>(supert-replace-T) <cmd>call <SID>do_search('T', 'v')<cr>
+vnoremap <Plug>(supert-replace-f) <cmd>call <SID>do_search('f', 'v')<cr>
+vnoremap <Plug>(supert-replace-F) <cmd>call <SID>do_search('F', 'v')<cr>
 
-onoremap <Plug>(supert-replace-t) :<c-u>call <SID>do_search('t', 'o')<cr>
-onoremap <Plug>(supert-replace-T) :<c-u>call <SID>do_search('T', 'o')<cr>
-onoremap <Plug>(supert-replace-f) :<c-u>call <SID>do_search('f', 'o')<cr>
-onoremap <Plug>(supert-replace-F) :<c-u>call <SID>do_search('F', 'o')<cr> ; 
+onoremap <Plug>(supert-replace-t) <cmd>call <SID>do_search('t', 'o')<cr>
+onoremap <Plug>(supert-replace-T) <cmd>call <SID>do_search('T', 'o')<cr>
+onoremap <Plug>(supert-replace-f) <cmd>call <SID>do_search('f', 'o')<cr>
+onoremap <Plug>(supert-replace-F) <cmd>call <SID>do_search('F', 'o')<cr>
 
-onoremap <Plug>(supert-replace-,) :<c-u>call <SID>do_search(',', 'o')<cr>
-onoremap <Plug>(supert-replace-;) :<c-u>call <SID>do_search(';', 'o')<cr>
+onoremap <Plug>(supert-replace-,) <cmd>call <SID>do_search(',', 'o')<cr>
+onoremap <Plug>(supert-replace-;) <cmd>call <SID>do_search(';', 'o')<cr>
 
-vnoremap <Plug>(supert-replace-,) :<c-u>call <SID>do_search(',', 'v')<cr>
-vnoremap <Plug>(supert-replace-;) :<c-u>call <SID>do_search(';', 'v')<cr>
+vnoremap <Plug>(supert-replace-,) <cmd>call <SID>do_search(',', 'v')<cr>
+vnoremap <Plug>(supert-replace-;) <cmd>call <SID>do_search(';', 'v')<cr>
 
-nnoremap <Plug>(supert-replace-,) :<c-u>call <SID>do_search(',', '')<cr>
-nnoremap <Plug>(supert-replace-;) :<c-u>call <SID>do_search(';', '')<cr>
+nnoremap <Plug>(supert-replace-,) <cmd>call <SID>do_search(',', '')<cr>
+nnoremap <Plug>(supert-replace-;) <cmd>call <SID>do_search(';', '')<cr>
 
 
 if g:supert_provide_bindings
-- 
cgit