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/joiner.vim | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'plugin/joiner.vim')

diff --git a/plugin/joiner.vim b/plugin/joiner.vim
index 26cb5a3..5345fbe 100644
--- a/plugin/joiner.vim
+++ b/plugin/joiner.vim
@@ -23,13 +23,13 @@ if ! exists('g:joiner_leader')
   let g:joiner_leader = '<C-j>'
 endif
 
-noremap  <silent> <Plug>(joiner)s :<c-u>let g:JoinerJoinText=function('joiner#join_with_string')<cr>:<c-u>set operatorfunc=joiner#do<cr>g@
-noremap  <silent> <Plug>(joiner)S :<c-u>let g:JoinerJoinText=function('joiner#join_with_string_literal')<cr>:<c-u>set operatorfunc=joiner#do<cr>g@
-noremap  <silent> <Plug>(joiner)  :<c-u>let g:JoinerJoinText=function('joiner#default_join')<cr>:<c-u>set operatorfunc=joiner#do<cr>g@
+noremap  <silent> <Plug>(joiner)s <cmd>let g:JoinerJoinText=function('joiner#join_with_string')<cr><cmd>set operatorfunc=joiner#do<cr>g@
+noremap  <silent> <Plug>(joiner)S <cmd>let g:JoinerJoinText=function('joiner#join_with_string_literal')<cr><cmd>set operatorfunc=joiner#do<cr>g@
+noremap  <silent> <Plug>(joiner)  <cmd>let g:JoinerJoinText=function('joiner#default_join')<cr><cmd>set operatorfunc=joiner#do<cr>g@
 
-vnoremap <silent> <Plug>(joiner)s       :<c-u>let g:JoinerJoinText=function('joiner#join_with_string')<cr>gv:<c-u>call joiner#do(visualmode(), 1)<cr>
-vnoremap <silent> <Plug>(joiner)S       :<c-u>let g:JoinerJoinText=function('joiner#join_with_string_literal')<cr>gv:<c-u>call joiner#do(visualmode(), 1)<cr>
-vnoremap <silent> <Plug>(joiner)<space> :<c-u>let g:JoinerJoinText=function('joiner#default_join')<cr>gv:<c-u>call joiner#do(visualmode(), 1)<cr>
+vnoremap <silent> <Plug>(joiner)s       <cmd>let g:JoinerJoinText=function('joiner#join_with_string')<cr>gv<cmd>call joiner#do(visualmode(), 1)<cr>
+vnoremap <silent> <Plug>(joiner)S       <cmd>let g:JoinerJoinText=function('joiner#join_with_string_literal')<cr><cmd>call joiner#do(visualmode(), 1)<cr>
+vnoremap <silent> <Plug>(joiner)<space> <cmd>let g:JoinerJoinText=function('joiner#default_join')<cr><cmd>call joiner#do(visualmode(), 1)<cr>
 
 if g:joiner_include_bindings
   exec printf("vnoremap <silent> %s <Plug>(joiner)", g:joiner_leader)
-- 
cgit