From a49227fb4912ddd3c251130a4542153c7d1499a2 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sat, 29 Dec 2018 23:35:00 +1300 Subject: Correct active register passing --- autoload/replace_operator.vim | 8 +++----- plugin/replace_operator.vim | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/autoload/replace_operator.vim b/autoload/replace_operator.vim index ff442b6..6b8ce96 100644 --- a/autoload/replace_operator.vim +++ b/autoload/replace_operator.vim @@ -1,9 +1,6 @@ " Replace the operated text with the contents of a register function! replace_operator#Operatorfunc(type) abort - " Save the active register into a local variable - let l:register = v:register - " Save the current value of the unnamed register and the current value of " the 'clipboard' and 'selection' options into a dictionary for restoring " after this is all done @@ -33,8 +30,8 @@ function! replace_operator#Operatorfunc(type) abort " a register prefix if it's not the default unnamed register, because Vim " before 7.4 gets ""p wrong in visual mode let l:paste = 'p' - if l:register !=# '"' - let l:paste = '"'.l:register.l:paste + if s:register !=# '"' + let l:paste = '"'.s:register.l:paste endif silent execute 'normal! '.l:select.l:paste @@ -48,6 +45,7 @@ endfunction " Helper function for normal mode map function! replace_operator#Map(register) abort + let s:register = a:register set operatorfunc=replace_operator#Operatorfunc return 'g@' endfunction diff --git a/plugin/replace_operator.vim b/plugin/replace_operator.vim index 982b573..a8cf835 100644 --- a/plugin/replace_operator.vim +++ b/plugin/replace_operator.vim @@ -15,6 +15,6 @@ let g:loaded_replace_operator = 1 " Set up mapping nnoremap (ReplaceOperator) - \ replace_operator#Map() + \ replace_operator#Map(v:register) xnoremap (ReplaceOperator) - \ replace_operator#Map() + \ replace_operator#Map(v:register) -- cgit v1.2.3 From be1809e1ec187d45c77e5561cdf8d87ae23bada6 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Sat, 29 Dec 2018 23:35:11 +1300 Subject: Bump VERSION --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 7dea76e..6d7de6e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.1 +1.0.2 -- cgit v1.2.3