Skip to content

Commit

Permalink
Add <plug>(plug-preview) map (#769)
Browse files Browse the repository at this point in the history
This allows you to override the default behavior of `o' or `<cr>'
binding in PlugDiff window.

e.g.
    " Move to preview window
    autocmd! FileType vim-plug nmap <buffer> o <plug>(plug-preview)<c-w>P

Close #749
Close #768
  • Loading branch information
junegunn authored Jun 20, 2018
1 parent fef4e43 commit f80eed7
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 4 deletions.
9 changes: 7 additions & 2 deletions plug.vim
Original file line number Diff line number Diff line change
Expand Up @@ -2426,8 +2426,13 @@ function! s:diff()
\ . (cnts[1] ? printf(' %d plugin(s) have pending updates.', cnts[1]) : ''))

if cnts[0] || cnts[1]
nnoremap <silent> <buffer> <cr> :silent! call <SID>preview_commit()<cr>
nnoremap <silent> <buffer> o :silent! call <SID>preview_commit()<cr>
nnoremap <silent> <buffer> <plug>(plug-preview) :silent! call <SID>preview_commit()<cr>
if empty(maparg("\<cr>", 'n'))
nmap <buffer> <cr> <plug>(plug-preview)
endif
if empty(maparg('o', 'n'))
nmap <buffer> o <plug>(plug-preview)
endif
endif
if cnts[0]
nnoremap <silent> <buffer> X :call <SID>revert()<cr>
Expand Down
11 changes: 9 additions & 2 deletions test/workflow.vader
Original file line number Diff line number Diff line change
Expand Up @@ -370,8 +370,15 @@ Execute (New commits on remote, PlugUpdate, then PlugDiff):
AssertEqual 1, &previewwindow
AssertEqual 'git', &filetype

" Back to plug window
wincmd p
" Close preview window
pclose

" Open and go to preview window with a custom mapping
nmap <buffer> <c-o> <plug>(plug-preview)<c-w>P
execute "normal \<c-o>"
AssertEqual 1, &previewwindow, 'Should be on preview window'
normal q
AssertEqual 0, &previewwindow, 'Should not be on preview window'

" ]] motion
execute 'normal $]]'
Expand Down

0 comments on commit f80eed7

Please sign in to comment.