README.markdown

@@ -1,4 +1,5 @@
-# repeat.vim
+repeat.vim
+==========
 
 If you've ever tried using the `.` command after a plugin map, you were
 likely disappointed to discover it only repeated the last native command
@@ -10,30 +11,33 @@ The following plugins support repeat.vim:
 
 * [surround.vim](https://github.com/tpope/vim-surround)
 * [speeddating.vim](https://github.com/tpope/vim-speeddating)
+* [abolish.vim](https://github.com/tpope/vim-abolish)
 * [unimpaired.vim](https://github.com/tpope/vim-unimpaired)
-* [vim-easyclip](https://github.com/svermeulen/vim-easyclip)
+* [commentary.vim](https://github.com/tpope/vim-commentary)
-* [vim-radical](https://github.com/glts/vim-radical)
 
 Adding support to a plugin is generally as simple as the following
 command at the end of your map functions.
 
     silent! call repeat#set("\<Plug>MyWonderfulMap", v:count)
 
-## Installation
+Installation
+------------
 
-Install using your favorite package manager, or use Vim's built-in package
+If you don't have a preferred installation method, I recommend
-support:
+installing [pathogen.vim](https://github.com/tpope/vim-pathogen), and
+then simply copy and paste:
 
-    mkdir -p ~/.vim/pack/tpope/start
+    cd ~/.vim/bundle
-    cd ~/.vim/pack/tpope/start
+    git clone git://github.com/tpope/vim-repeat.git
-    git clone https://tpope.io/vim/repeat.git
 
-## Contributing
+Contributing
+------------
 
 See the contribution guidelines for
 [pathogen.vim](https://github.com/tpope/vim-pathogen#readme).
 
-## Self-Promotion
+Self-Promotion
+--------------
 
 Like repeat.vim? Follow the repository on
 [GitHub](https://github.com/tpope/vim-repeat) and vote for it on
@@ -42,7 +46,8 @@ you're feeling especially charitable, follow [tpope](http://tpo.pe/) on
 [Twitter](http://twitter.com/tpope) and
 [GitHub](https://github.com/tpope).
 
-## License
+License
+-------
 
 Copyright (c) Tim Pope.  Distributed under the same terms as Vim itself.
 See `:help license`.

autoload/repeat.vim

@@ -1,6 +1,6 @@
 " repeat.vim - Let the repeat command repeat plugin maps
 " Maintainer:   Tim Pope
-" Version:      1.2
+" Version:      1.1
 " GetLatestVimScripts: 2136 1 :AutoInstall: repeat.vim
 
 " Installation:
@@ -44,7 +44,7 @@
 "   \   call <SID>MyFunction(v:register, ...)<Bar>
 "   \   silent! call repeat#set("\<lt>Plug>MyMap")<CR>
 
-if exists("g:loaded_repeat") || &cp || v:version < 800
+if exists("g:loaded_repeat") || &cp || v:version < 700
     finish
 endif
 let g:loaded_repeat = 1
@@ -55,7 +55,6 @@ 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.
 function! repeat#invalidate()
-    autocmd! repeat_custom_motion
     let g:repeat_tick = -1
 endfunction
 
@@ -63,89 +62,49 @@ function! repeat#set(sequence,...)
     let g:repeat_sequence = a:sequence
     let g:repeat_count = a:0 ? a:1 : v:count
     let g:repeat_tick = b:changedtick
-    augroup repeat_custom_motion
-        autocmd!
-        autocmd CursorMoved <buffer> let g:repeat_tick = b:changedtick | autocmd! repeat_custom_motion
-    augroup END
 endfunction
 
 function! repeat#setreg(sequence,register)
     let g:repeat_reg = [a:sequence, a:register]
 endfunction
 
+function! repeat#run(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
 
-function! s:default_register()
+        let c = g:repeat_count
-    let values = split(&clipboard, ',')
+        let s = g:repeat_sequence
-    if index(values, 'unnamedplus') != -1
+        let cnt = c == -1 ? "" : (a:count ? a:count : (c ? c : ''))
-        return '+'
+        call feedkeys(r . cnt, 'n')
-    elseif index(values, 'unnamed') != -1
+        call feedkeys(s)
-        return '*'
     else
-        return '"'
+        call feedkeys((a:count ? a:count : '') . '.', 'n')
     endif
 endfunction
 
-function! repeat#run(count)
-    let s:errmsg = ''
-    try
-        if g:repeat_tick == b:changedtick
-            let r = ''
-            if g:repeat_reg[0] ==# g:repeat_sequence && !empty(g:repeat_reg[1])
-                " Take the original register, unless another (non-default, we
-                " unfortunately cannot detect no vs. a given default register)
-                " register has been supplied to the repeat command (as an
-                " explicit override).
-                let regname = v:register ==# s:default_register() ? g:repeat_reg[1] : v:register
-                if regname ==# '='
-                    " This causes a re-evaluation of the expression on repeat, which
-                    " is what we want.
-                    let r = '"=' . getreg('=', 1) . "\<CR>"
-                else
-                    let r = '"' . regname
-                endif
-            endif
-
-            let c = g:repeat_count
-            let s = g:repeat_sequence
-            let cnt = c == -1 ? "" : (a:count ? a:count : (c ? c : ''))
-            call feedkeys(s, 'i')
-            call feedkeys(r . cnt, 'ni')
-        else
-            call feedkeys((a:count ? a:count : '') . '.', 'ni')
-        endif
-    catch /^Vim(normal):/
-        let s:errmsg = v:errmsg
-        return 0
-    endtry
-    return 1
-endfunction
-function! repeat#errmsg()
-    return s:errmsg
-endfunction
-
 function! repeat#wrap(command,count)
-    let foldopen = &foldopen =~# 'undo\|all' ? 'zv' : ''
+    let preserve = (g:repeat_tick == b:changedtick)
-    let preserve = g:repeat_tick == b:changedtick ? ":let g:repeat_tick = b:changedtick\r" : ''
+    exe 'norm! '.(a:count ? a:count : '').a:command . (&foldopen =~# 'undo' ? 'zv' : '')
-    return (a:count ? a:count : '') . a:command . preserve . foldopen
+    if preserve
+        let g:repeat_tick = b:changedtick
+    endif
 endfunction
 
-nnoremap <silent> <Plug>(RepeatDot)      :<C-U>if !repeat#run(v:count)<Bar>echoerr repeat#errmsg()<Bar>endif<CR>
+nnoremap <silent> .     :<C-U>call repeat#run(v:count)<CR>
-nmap <silent><expr><script> <Plug>(RepeatUndo)     repeat#wrap('u',v:count)
+nnoremap <silent> u     :<C-U>call repeat#wrap('u',v:count)<CR>
-nmap <silent><expr><script> <Plug>(RepeatUndoLine) repeat#wrap('U',v:count)
+if maparg('U','n') ==# ''
-nmap <silent><expr><script> <Plug>(RepeatRedo)     repeat#wrap("\022",v:count)
+    nnoremap <silent> U     :<C-U>call repeat#wrap('U',v:count)<CR>
-
-if !hasmapto('<Plug>(RepeatDot)', 'n')
-    nmap . <Plug>(RepeatDot)
-endif
-if !hasmapto('<Plug>(RepeatUndo)', 'n')
-    nmap u <Plug>(RepeatUndo)
-endif
-if maparg('U','n') ==# '' && !hasmapto('<Plug>(RepeatUndoLine)', 'n')
-    nmap U <Plug>(RepeatUndoLine)
-endif
-if !hasmapto('<Plug>(RepeatRedo)', 'n')
-    nmap <C-R> <Plug>(RepeatRedo)
 endif
+nnoremap <silent> <C-R> :<C-U>call repeat#wrap("\<Lt>C-R>",v:count)<CR>
 
 augroup repeatPlugin
     autocmd!