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

Ensure staging from preview always stages into correct file

Browse Source 
Fixes #785.
This commit is contained in:
Andy Stewart
2023-06-01 14:59:56 +01:00
parent ef978c745f
commit 11d6e13194
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
autoload/gitgutter/hunk.vim
View File

@@ -423,6 +423,7 @@ endfunction
" Preview window: moves cursor to preview window. " Preview window: moves cursor to preview window.
function! s:open_hunk_preview_window() function! s:open_hunk_preview_window()
let source_wrap = &wrap let source_wrap = &wrap
let source_window = winnr()
if g:gitgutter_preview_win_floating if g:gitgutter_preview_win_floating
if exists('*nvim_open_win') if exists('*nvim_open_win')
@@ -484,11 +485,12 @@ function! s:open_hunk_preview_window()
endif endif
setlocal filetype=diff buftype=acwrite bufhidden=delete setlocal filetype=diff buftype=acwrite bufhidden=delete
let &l:wrap = source_wrap let &l:wrap = source_wrap
let b:source_window = source_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
" Ensure cursor goes to the expected window. " Ensure cursor goes to the expected window.
nnoremap <buffer> <silent> <Esc> :<C-U>wincmd p<Bar>pclose<CR> nnoremap <buffer> <silent> <Esc> :<C-U>execute b:source_window . "wincmd w"<Bar>pclose<CR>
endif endif
if exists('&previewpopup') if exists('&previewpopup')
@@ -599,7 +601,7 @@ endfunction
function! s:goto_original_window() function! s:goto_original_window()
noautocmd wincmd p noautocmd execute b:source_window . "wincmd w"
doautocmd WinEnter doautocmd WinEnter
endfunction endfunction