m-vim_plugins/vim-gitgutter
1
0
Fork 0
mirror of https://github.com/airblade/vim-gitgutter.git synced 2025-11-11 13:03:45 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Avoid cursor in unexpected window after Esc in preview

Browse Source 
Thanks @andymass for the patch.

See #769.
This commit is contained in:
Andy Stewart
2021-03-19 16:31:26 +00:00
parent 7224d1d8d7
commit 24cc477895
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
autoload/gitgutter/hunk.vim
View File

@@ -466,6 +466,8 @@ function! s:open_hunk_preview_window()
endif endif
endif endif
" Specifying where to open the preview window can lead to the cursor going
" to an unexpected window when the preview window is closed (#769).
noautocmd execute g:gitgutter_preview_win_location 'pedit gitgutter://hunk-preview' noautocmd execute g:gitgutter_preview_win_location 'pedit gitgutter://hunk-preview'
silent! wincmd P silent! wincmd P
setlocal statusline=%{''} setlocal statusline=%{''}
@@ -479,7 +481,8 @@ function! s:open_hunk_preview_window()
" Reset some defaults in case someone else has changed them. " Reset some defaults in case someone else has changed them.
setlocal noreadonly modifiable noswapfile setlocal noreadonly modifiable noswapfile
if g:gitgutter_close_preview_on_escape if g:gitgutter_close_preview_on_escape
nnoremap <buffer> <silent> <Esc> :pclose<CR> " Ensure cursor goes to the expected window.
nnoremap <buffer> <silent> <Esc> :<C-U>wincmd p<Bar>pclose<CR>
endif endif
endfunction endfunction