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

GPGEncrypt: Remove (file)encoding dance around file encryption

Browse Source 
Changing &encoding when &fileencoding != &encoding causes two problems.

First, it's completely unsafe to change &encoding after vim is running,
since there may be characters that can't be translated from one encoding
to another, which can make vim crash.

Second, this actually loses information about the buffer's encoding.
When the encrypted file is opened later, it won't be in the same
encoding as before it was saved.  Changing user's data on them is
unacceptable.

Signed-off-by: James McCoy <jamessan@jamessan.com>
This commit is contained in:
James McCoy 2016-09-18 15:22:06 -04:00
parent 22cca0c821
commit 454090fe40
No known key found for this signature in database
GPG Key ID: DFE691AE331BA3DB
1 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
plugin/gnupg.vim
View File

@ -644,16 +644,6 @@ function s:GPGEncrypt()
silent exe ':doautocmd '. auType .'Pre '. autocmd_filename silent exe ':doautocmd '. auType .'Pre '. autocmd_filename
call s:GPGDebug(2, 'called '. auType .'Pre autocommand for ' . autocmd_filename) call s:GPGDebug(2, 'called '. auType .'Pre autocommand for ' . autocmd_filename)
" store encoding and switch to a safe one
if (&fileencoding != &encoding)
let s:GPGEncoding = &encoding
let &encoding = &fileencoding
call s:GPGDebug(2, "encoding was \"" . s:GPGEncoding . "\", switched to \"" . &encoding . "\"")
else
let s:GPGEncoding = ""
call s:GPGDebug(2, "encoding and fileencoding are the same (\"" . &encoding . "\"), not switching")
endif
" guard for unencrypted files " guard for unencrypted files
if (exists("b:GPGEncrypted") && b:GPGEncrypted == 0) if (exists("b:GPGEncrypted") && b:GPGEncrypted == 0)
echohl GPGError echohl GPGError
@ -719,12 +709,6 @@ function s:GPGEncrypt()
let cmd.redirect = '>' . s:shellescape(destfile, 1) let cmd.redirect = '>' . s:shellescape(destfile, 1)
silent call s:GPGExecute(cmd) silent call s:GPGExecute(cmd)
" restore encoding
if (s:GPGEncoding != "")
let &encoding = s:GPGEncoding
call s:GPGDebug(2, "restored encoding \"" . &encoding . "\"")
endif
if (v:shell_error) " message could not be encrypted if (v:shell_error) " message could not be encrypted
" Command failed, so clean up the tempfile " Command failed, so clean up the tempfile
call delete(destfile) call delete(destfile)