Merge pull request #47 from orlp/master
Prevent stack trace of search errors.
This commit is contained in:
commit
7a6675f092
@ -74,34 +74,39 @@ function! repeat#setreg(sequence,register)
|
|||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
function! repeat#run(count)
|
function! repeat#run(count)
|
||||||
if g:repeat_tick == b:changedtick
|
try
|
||||||
let r = ''
|
if g:repeat_tick == b:changedtick
|
||||||
if g:repeat_reg[0] ==# g:repeat_sequence && !empty(g:repeat_reg[1])
|
let r = ''
|
||||||
if g:repeat_reg[1] ==# '='
|
if g:repeat_reg[0] ==# g:repeat_sequence && !empty(g:repeat_reg[1])
|
||||||
" This causes a re-evaluation of the expression on repeat, which
|
if g:repeat_reg[1] ==# '='
|
||||||
" is what we want.
|
" This causes a re-evaluation of the expression on repeat, which
|
||||||
let r = '"=' . getreg('=', 1) . "\<CR>"
|
" 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 : ''))
|
||||||
|
if ((v:version == 703 && has('patch100')) || (v:version == 704 && !has('patch601')))
|
||||||
|
exe 'norm ' . r . cnt . s
|
||||||
else
|
else
|
||||||
let r = '"' . g:repeat_reg[1]
|
call feedkeys(s, 'i')
|
||||||
|
call feedkeys(r . cnt, 'ni')
|
||||||
|
endif
|
||||||
|
else
|
||||||
|
if ((v:version == 703 && has('patch100')) || (v:version == 704 && !has('patch601')))
|
||||||
|
exe 'norm! '.(a:count ? a:count : '') . '.'
|
||||||
|
else
|
||||||
|
call feedkeys((a:count ? a:count : '') . '.', 'ni')
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
catch /^Vim(normal):/
|
||||||
let c = g:repeat_count
|
return 'echoerr v:errmsg'
|
||||||
let s = g:repeat_sequence
|
endtry
|
||||||
let cnt = c == -1 ? "" : (a:count ? a:count : (c ? c : ''))
|
return ''
|
||||||
if ((v:version == 703 && has('patch100')) || (v:version == 704 && !has('patch601')))
|
|
||||||
exe 'norm ' . r . cnt . s
|
|
||||||
else
|
|
||||||
call feedkeys(s, 'i')
|
|
||||||
call feedkeys(r . cnt, 'ni')
|
|
||||||
endif
|
|
||||||
else
|
|
||||||
if ((v:version == 703 && has('patch100')) || (v:version == 704 && !has('patch601')))
|
|
||||||
exe 'norm! '.(a:count ? a:count : '') . '.'
|
|
||||||
else
|
|
||||||
call feedkeys((a:count ? a:count : '') . '.', 'ni')
|
|
||||||
endif
|
|
||||||
endif
|
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
function! repeat#wrap(command,count)
|
function! repeat#wrap(command,count)
|
||||||
@ -112,7 +117,7 @@ function! repeat#wrap(command,count)
|
|||||||
endif
|
endif
|
||||||
endfunction
|
endfunction
|
||||||
|
|
||||||
nnoremap <silent> <Plug>(RepeatDot) :<C-U>call repeat#run(v:count)<CR>
|
nnoremap <silent> <Plug>(RepeatDot) :<C-U>exe repeat#run(v:count)<CR>
|
||||||
nnoremap <silent> <Plug>(RepeatUndo) :<C-U>call repeat#wrap('u',v:count)<CR>
|
nnoremap <silent> <Plug>(RepeatUndo) :<C-U>call repeat#wrap('u',v:count)<CR>
|
||||||
nnoremap <silent> <Plug>(RepeatUndoLine) :<C-U>call repeat#wrap('U',v:count)<CR>
|
nnoremap <silent> <Plug>(RepeatUndoLine) :<C-U>call repeat#wrap('U',v:count)<CR>
|
||||||
nnoremap <silent> <Plug>(RepeatRedo) :<C-U>call repeat#wrap("\<Lt>C-R>",v:count)<CR>
|
nnoremap <silent> <Plug>(RepeatRedo) :<C-U>call repeat#wrap("\<Lt>C-R>",v:count)<CR>
|
||||||
|
Loading…
Reference in New Issue
Block a user