vim/vim-gnupg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use a common function to create GPGEdit{Options,Recipients} buffer

Browse Source 
Signed-off-by: James McCoy <jamessan@jamessan.com>
This commit is contained in:
James McCoy 2019-02-11 23:06:01 -05:00
parent db08c3873f
commit d90ae08795
No known key found for this signature in database
GPG Key ID: DFE691AE331BA3DB
1 changed files with 53 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
autoload/gnupg.vim
View File

@ -1,5 +1,5 @@
" Name: autoload/gnupg.vim " Name: autoload/gnupg.vim
" Last Change: 2019 Feb 03 " Last Change: 2019 Feb 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.
@ -585,6 +585,52 @@ function gnupg#encrypt()
call s:GPGDebug(3, "<<<<<<<< Leaving gnupg#encrypt()") call s:GPGDebug(3, "<<<<<<<< Leaving gnupg#encrypt()")
endfunction endfunction
" Function: s:NewInputBuffer(basename) {{{2
"
" Create the input buffer used for editing the recipients or options.
"
function s:NewInputBuffer(basename)
" only do this if it isn't already an input buffer
if !exists('b:GPGCorrespondingTo')
" save buffer name
let buffername = bufnr('%')
let editbuffername = a:basename . '_' . buffername
" check if this buffer exists
if !bufexists(editbuffername)
" create scratch buffer
execute 'silent! split ' . fnameescape(editbuffername)
else
if bufwinnr(editbuffername) >= 0
" switch to scratch buffer window
execute 'silent! ' . bufwinnr(editbuffername) . 'wincmd w'
else
" split scratch buffer window
execute 'silent! sbuffer ' . fnameescape(editbuffername)
endif
" empty the buffer
silent %delete
endif
" Mark the buffer as a scratch buffer
setlocal buftype=acwrite
setlocal bufhidden=hide
setlocal noswapfile
setlocal nowrap
setlocal nobuflisted
setlocal nonumber
" so we know for which other buffer this edit buffer is
let b:GPGCorrespondingTo = buffername
return 1
endif
return 0
endfunction
" Function: gnupg#view_recipients() {{{2 " Function: gnupg#view_recipients() {{{2
" "
" echo the recipients " echo the recipients
@ -633,46 +679,9 @@ function gnupg#edit_recipients()
return return
endif endif
" only do this if it isn't already a GPGRecipients_* buffer if s:NewInputBuffer('GPGRecipients')
if (!exists('b:GPGCorrespondingTo')) " add a autocommand to regenerate the recipients after a write
autocmd BufHidden,BufUnload,BufWriteCmd <buffer> call s:GPGFinishRecipientsBuffer()
" save buffer name
let buffername = bufnr("%")
let editbuffername = "GPGRecipients_" . buffername
" check if this buffer exists
if (!bufexists(editbuffername))
" create scratch buffer
execute 'silent! split ' . fnameescape(editbuffername)
" add a autocommand to regenerate the recipients after a write
autocmd BufHidden,BufUnload,BufWriteCmd <buffer> call s:GPGFinishRecipientsBuffer()
else
if (bufwinnr(editbuffername) >= 0)
" switch to scratch buffer window
execute 'silent! ' . bufwinnr(editbuffername) . "wincmd w"
else
" split scratch buffer window
execute 'silent! sbuffer ' . fnameescape(editbuffername)
" add a autocommand to regenerate the recipients after a write
autocmd BufHidden,BufUnload,BufWriteCmd <buffer> call s:GPGFinishRecipientsBuffer()
endif
" empty the buffer
silent %delete
endif
" Mark the buffer as a scratch buffer
setlocal buftype=acwrite
setlocal bufhidden=hide
setlocal noswapfile
setlocal nowrap
setlocal nobuflisted
setlocal nonumber
" so we know for which other buffer this edit buffer is
let b:GPGCorrespondingTo = buffername
" put some comments to the scratch buffer " put some comments to the scratch buffer
silent put ='GPG: ----------------------------------------------------------------------' silent put ='GPG: ----------------------------------------------------------------------'
@ -846,44 +855,9 @@ function gnupg#edit_options()
endif endif
" only do this if it isn't already a GPGOptions_* buffer " only do this if it isn't already a GPGOptions_* buffer
if (!exists('b:GPGCorrespondingTo')) if s:NewInputBuffer('GPGOptions')
" add a autocommand to regenerate the options after a write
" save buffer name autocmd BufHidden,BufUnload,BufWriteCmd <buffer> call s:GPGFinishOptionsBuffer()
let buffername = bufnr("%")
let editbuffername = "GPGOptions_" . buffername
" check if this buffer exists
if (!bufexists(editbuffername))
" create scratch buffer
execute 'silent! split ' . fnameescape(editbuffername)
" add a autocommand to regenerate the options after a write
autocmd BufHidden,BufUnload,BufWriteCmd <buffer> call s:GPGFinishOptionsBuffer()
else
if (bufwinnr(editbuffername) >= 0)
" switch to scratch buffer window
execute 'silent! ' . bufwinnr(editbuffername) . "wincmd w"
else
" split scratch buffer window
execute 'silent! sbuffer ' . fnameescape(editbuffername)
" add a autocommand to regenerate the options after a write
autocmd BufHidden,BufUnload,BufWriteCmd <buffer> call s:GPGFinishOptionsBuffer()
endif
" empty the buffer
silent %delete
endif
" Mark the buffer as a scratch buffer
setlocal buftype=nofile
setlocal noswapfile
setlocal nowrap
setlocal nobuflisted
setlocal nonumber
" so we know for which other buffer this edit buffer is
let b:GPGCorrespondingTo = buffername
" put some comments to the scratch buffer " put some comments to the scratch buffer
silent put ='GPG: ----------------------------------------------------------------------' silent put ='GPG: ----------------------------------------------------------------------'