Github/vim-plug
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add <nowait> argument for buffer-local mappings

Browse Source 
- Prevents collisions with global mappings which would require the user
to wait for 'timeout' to expire
This commit is contained in:
Pierre Douyon 2015-01-12 10:18:42 -05:00
parent ebe8635043
commit ec139fd737
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
plug.vim
View File

@ -564,14 +564,14 @@ function! s:prepare()
silent %d _ silent %d _
else else
call s:new_window() call s:new_window()
nnoremap <silent> <buffer> q :if b:plug_preview==1<bar>pc<bar>endif<bar>echo<bar>q<cr> nnoremap <silent> <buffer> <nowait> q :if b:plug_preview==1<bar>pc<bar>endif<bar>echo<bar>q<cr>
nnoremap <silent> <buffer> R :silent! call <SID>retry()<cr> nnoremap <silent> <buffer> <nowait> R :silent! call <SID>retry()<cr>
nnoremap <silent> <buffer> D :PlugDiff<cr> nnoremap <silent> <buffer> <nowait> D :PlugDiff<cr>
nnoremap <silent> <buffer> S :PlugStatus<cr> nnoremap <silent> <buffer> <nowait> S :PlugStatus<cr>
nnoremap <silent> <buffer> U :call <SID>status_update()<cr> nnoremap <silent> <buffer> <nowait> U :call <SID>status_update()<cr>
xnoremap <silent> <buffer> U :call <SID>status_update()<cr> xnoremap <silent> <buffer> <nowait> U :call <SID>status_update()<cr>
nnoremap <silent> <buffer> ]] :silent! call <SID>section('')<cr> nnoremap <silent> <buffer> <nowait> ]] :silent! call <SID>section('')<cr>
nnoremap <silent> <buffer> [[ :silent! call <SID>section('b')<cr> nnoremap <silent> <buffer> <nowait> [[ :silent! call <SID>section('b')<cr>
let b:plug_preview = -1 let b:plug_preview = -1
let s:plug_tab = tabpagenr() let s:plug_tab = tabpagenr()
let s:plug_buf = winbufnr(0) let s:plug_buf = winbufnr(0)
@ -1368,8 +1368,8 @@ function! s:status()
setlocal nomodifiable setlocal nomodifiable
if unloaded if unloaded
echo "Press 'L' on each line to load plugin, or 'U' to update" echo "Press 'L' on each line to load plugin, or 'U' to update"
nnoremap <silent> <buffer> L :call <SID>status_load(line('.'))<cr> nnoremap <silent> <buffer> <nowait> L :call <SID>status_load(line('.'))<cr>
xnoremap <silent> <buffer> L :call <SID>status_load(line('.'))<cr> xnoremap <silent> <buffer> <nowait> L :call <SID>status_load(line('.'))<cr>
end end
endfunction endfunction
@ -1471,8 +1471,8 @@ function! s:diff()
endfor endfor
call setline(1, cnt == 0 ? 'No updates.' : 'Last update:') call setline(1, cnt == 0 ? 'No updates.' : 'Last update:')
nnoremap <silent> <buffer> <cr> :silent! call <SID>preview_commit()<cr> nnoremap <silent> <buffer> <nowait> <cr> :silent! call <SID>preview_commit()<cr>
nnoremap <silent> <buffer> X :call <SID>revert()<cr> nnoremap <silent> <buffer> <nowait> X :call <SID>revert()<cr>
normal! gg normal! gg
setlocal nomodifiable setlocal nomodifiable
if cnt > 0 if cnt > 0