jonas/vim-gnupg
1
0
Fork 0
mirror of https://github.com/Ascyii/vim-gnupg.git synced 2026-01-01 06:14:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Return early from Finish functions when buffer is not displayed

Browse Source 
When bufwinnr() returns -1, the buffer isn't currently displayed.  In
this case, we need to return so the contents of a different buffer
aren't used for recipients/options.
This commit is contained in:
James McCoy
2020-11-11 13:06:05 -05:00
parent 6b56cdceda
commit 84fc245438
1 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
autoload/gnupg.vim
View File

@@ -769,8 +769,14 @@ function s:GPGFinishRecipientsBuffer()
" go to buffer before doing work " go to buffer before doing work
if (bufnr("%") != expand("<abuf>")) if (bufnr("%") != expand("<abuf>"))
" switch to scratch buffer window let winnr = bufwinnr(expand('<afile>:p'))
execute 'silent! ' . bufwinnr(expand("<afile>:p")) . "wincmd w" if winnr >= 0
" switch to scratch buffer window
execute 'silent! ' . winnr . "wincmd w"
else
call s:GPGDebug(3, '<<<<<<<< Leaving s:GPGFinishRecipientsBuffer() early because buffer is not displayed')
return
endif
endif endif
" get the recipients from the scratch buffer " get the recipients from the scratch buffer
@@ -915,8 +921,14 @@ function s:GPGFinishOptionsBuffer()
" go to buffer before doing work " go to buffer before doing work
if (bufnr("%") != expand("<abuf>")) if (bufnr("%") != expand("<abuf>"))
" switch to scratch buffer window let winnr = bufwinnr(expand('<afile>:p'))
execute 'silent! ' . bufwinnr(expand("<afile>:p")) . "wincmd w" if winnr >= 0
" switch to scratch buffer window
execute 'silent! ' . winnr . "wincmd w"
else
call s:GPGDebug(3, '<<<<<<<< Leaving s:GPGFinishOptionsBuffer() early because buffer is not displayed')
return
endif
endif endif
" clear options and unknownOptions " clear options and unknownOptions