From 2914f11f7494adefaaec1d8c817a301c464c94b2 Mon Sep 17 00:00:00 2001
From: Ingo Karkat <swdev@ingo-karkat.de>
Date: Fri, 2 Dec 2011 22:20:46 +0100
Subject: [PATCH] Support repetition with original register

For commands that take an optional register (like p/P), Vim uses the
same register on repetition. This enhancement allows the same for custom
mappings, which need to call repeat#setreg() before repeat#set(). (No
changes for the vast majority of mappings that don't use registers.) It
even supports repeat of the expression register, with the expression
being re-evaluated on repeat.
---
 autoload/repeat.vim | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/autoload/repeat.vim b/autoload/repeat.vim
index 88a20bb..6b0c763 100644
--- a/autoload/repeat.vim
+++ b/autoload/repeat.vim
@@ -29,6 +29,20 @@
 "
 " Make sure to call the repeat#set function _after_ making changes to the
 " file.
+"
+" For mappings that use a register and want the same register used on
+" repetition, use:
+"
+"   silent! call repeat#setreg("\<Plug>MappingToRepeatCommand", v:register)
+"
+" This function can (and probably needs to be) called before making changes to
+" the file (as those typically clear v:register).  Therefore, the call sequence
+" in your mapping will look like this:
+"
+"   nnoremap <silent> <Plug>MyMap
+"   \   :<C-U>silent! call repeat#setreg("\<lt>Plug>MyMap", v:register)<Bar>
+"   \   call <SID>MyFunction(v:register, ...)<Bar>
+"   \   silent! call repeat#set("\<lt>Plug>MyMap")<CR>
 
 if exists("g:loaded_repeat") || &cp || v:version < 700
     finish
@@ -36,6 +50,7 @@ endif
 let g:loaded_repeat = 1
 
 let g:repeat_tick = -1
+let g:repeat_reg = ['', '']
 
 " Special function to avoid spurious repeats in a related, naturally repeating
 " mapping when your repeatable mapping doesn't increase b:changedtick.
@@ -49,12 +64,28 @@ function! repeat#set(sequence,...)
     let g:repeat_tick = b:changedtick
 endfunction
 
+function! repeat#setreg(sequence,register)
+    let g:repeat_reg = [a:sequence, a:register]
+endfunction
+
 function! s:repeat(count)
     if g:repeat_tick == b:changedtick
+        let r = ''
+        if g:repeat_reg[0] ==# g:repeat_sequence && !empty(g:repeat_reg[1])
+            if g:repeat_reg[1] ==# '='
+                " This causes a re-evaluation of the expression on repeat, which
+                " is what we want.
+                let r = '"=' . getreg('=', 1) . "\<CR>"
+            else
+                let r = '"' . g:repeat_reg[1]
+            endif
+        endif
+
         let c = g:repeat_count
         let s = g:repeat_sequence
         let cnt = c == -1 ? "" : (a:count ? a:count : (c ? c : ''))
-        call feedkeys(cnt . s)
+        call feedkeys(r . cnt, 'n')
+        call feedkeys(s)
     else
         call feedkeys((a:count ? a:count : '') . '.', 'n')
     endif