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

Stop setting g:GPGPreferArmor in GPGInit

Browse Source 
When the user hasn't explicity let g:GPGPreferArmor, the value is
supposed to be determined by the filename.  Instead of letting
g:GPGPreferArmor, lazily determine what should be done when actually
doing the encryption.

Signed-off-by: James McCoy <jamessan@jamessan.com>
This commit is contained in:
James McCoy 2016-04-24 23:04:21 -04:00
parent 2dfb82f13e
commit 541e333cfb
No known key found for this signature in database
GPG Key ID: DFE691AE331BA3DB
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
plugin/gnupg.vim
View File

@ -1,6 +1,6 @@
" Name: gnupg.vim " Name: gnupg.vim
" Last Change: 2015 Dec 17 " Last Change: 2016 Apr 24
" Maintainer: James McCoy <vega.james@gmail.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.
" License: This program is free software; you can redistribute it and/or " License: This program is free software; you can redistribute it and/or
@ -175,7 +175,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.5' let g:loaded_gnupg = '2.6'
let s:GPGInitRun = 0 let s:GPGInitRun = 0
" check for correct vim version {{{2 " check for correct vim version {{{2
@ -296,16 +296,6 @@ function s:GPGInit(bufread)
let g:GPGPreferSymmetric = 0 let g:GPGPreferSymmetric = 0
endif endif
" check if armored files are preferred
if (!exists("g:GPGPreferArmor"))
" .asc files should be armored as that's what the extension is used for
if expand('<afile>') =~ '\.asc$'
let g:GPGPreferArmor = 1
else
let g:GPGPreferArmor = 0
endif
endif
" check if signed files are preferred " check if signed files are preferred
if (!exists("g:GPGPreferSign")) if (!exists("g:GPGPreferSign"))
let g:GPGPreferSign = 0 let g:GPGPreferSign = 0
@ -670,6 +660,7 @@ function s:GPGEncrypt()
return return
endif endif
let filename = resolve(expand('<afile>'))
" initialize GPGOptions if not happened before " initialize GPGOptions if not happened before
if (!exists("b:GPGOptions") || empty(b:GPGOptions)) if (!exists("b:GPGOptions") || empty(b:GPGOptions))
let b:GPGOptions = [] let b:GPGOptions = []
@ -679,7 +670,10 @@ function s:GPGEncrypt()
else else
let b:GPGOptions += ["encrypt"] let b:GPGOptions += ["encrypt"]
endif endif
if (exists("g:GPGPreferArmor") && g:GPGPreferArmor == 1) " Fallback to preference by filename if the user didn't indicate
" their preference.
let preferArmor = get(g:, 'GPGPreferArmor', -1)
if (preferArmor >= 0 && preferArmor) || filename =~ '\.asc$'
let b:GPGOptions += ["armor"] let b:GPGOptions += ["armor"]
endif endif
if (exists("g:GPGPreferSign") && g:GPGPreferSign == 1) if (exists("g:GPGPreferSign") && g:GPGPreferSign == 1)
@ -738,7 +732,6 @@ function s:GPGEncrypt()
return return
endif endif
let filename = resolve(expand('<afile>'))
if rename(destfile, filename) if rename(destfile, filename)
" Rename failed, so clean up the tempfile " Rename failed, so clean up the tempfile
call delete(destfile) call delete(destfile)