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

Merge branch 'edit-option-window' into main

Browse Source
This commit is contained in:
James McCoy
2020-11-11 14:53:59 -05:00
parent a72ab0b1e0 84fc245438
commit 3099b040d0
2 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
autoload/gnupg.vim
View File

@@ -1,5 +1,5 @@
" Name: autoload/gnupg.vim " Name: autoload/gnupg.vim
" Last Change: 2020 Nov 09 " Last Change: 2020 Nov 11
" Maintainer: James McCoy <jamessan@jamessan.com> " Maintainer: James McCoy <jamessan@jamessan.com>
" Original Author: Markus Braun <markus.braun@krawel.de> " Original Author: Markus Braun <markus.braun@krawel.de>
" Summary: Vim plugin for transparent editing of gpg encrypted files. " Summary: Vim plugin for transparent editing of gpg encrypted files.
@@ -685,7 +685,8 @@ function gnupg#edit_recipients()
augroup GPGRecipients augroup GPGRecipients
au! * <buffer> au! * <buffer>
" add a autocommand to regenerate the recipients after a write " add a autocommand to regenerate the recipients after a write
autocmd BufHidden,BufUnload,BufWriteCmd <buffer> call s:GPGFinishRecipientsBuffer() autocmd BufHidden,BufWriteCmd <buffer> call s:GPGFinishRecipientsBuffer()
autocmd BufUnload <buffer> exe 'au! GPGRecipients * <buffer='. expand('<abuf>') .'>'
augroup END augroup END
" put some comments to the scratch buffer " put some comments to the scratch buffer
@@ -768,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
@@ -861,7 +868,8 @@ function gnupg#edit_options()
augroup GPGOptions augroup GPGOptions
au! * <buffer> au! * <buffer>
" add a autocommand to regenerate the options after a write " add a autocommand to regenerate the options after a write
autocmd BufHidden,BufUnload,BufWriteCmd <buffer> call s:GPGFinishOptionsBuffer() autocmd BufHidden,BufWriteCmd <buffer> call s:GPGFinishOptionsBuffer()
autocmd BufUnload <buffer> exe 'au! GPGOptions * <buffer='. expand('<abuf>') .'>'
augroup END augroup END
" put some comments to the scratch buffer " put some comments to the scratch buffer
@@ -913,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

4
plugin/gnupg.vim
View File

@@ -1,5 +1,5 @@
" Name: gnupg.vim " Name: gnupg.vim
" Last Change: 2020 Nov 09 " Last Change: 2020 Nov 11
" Maintainer: James McCoy <jamessan@jamessan.com> " Maintainer: James McCoy <jamessan@jamessan.com>
" Original Author: Markus Braun <markus.braun@krawel.de> " Original Author: Markus Braun <markus.braun@krawel.de>
" Summary: Vim plugin for transparent editing of gpg encrypted files. " Summary: Vim plugin for transparent editing of gpg encrypted files.
@@ -15,7 +15,7 @@
if (exists("g:loaded_gnupg") || &cp || exists("#GnuPG")) if (exists("g:loaded_gnupg") || &cp || exists("#GnuPG"))
finish finish
endif endif
let g:loaded_gnupg = '2.7.0' let g:loaded_gnupg = '2.7.1-dev'
" check for correct vim version {{{2 " check for correct vim version {{{2
if (v:version < 702) if (v:version < 702)