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

Set the buffer name to the resolved, absolute path

Browse Source 
If buftype=acwrite, Vim doesn't adjust relative buffer names when
changing directory.  Since 5103285d, encrypted buffers have set
buftype=acwrite and therefore also risked having incorrect buffer names
(e.g., if 'autochdir' is set).

Now that the buffer name is always fully resolved, this should no longer
be a problem.

Closes jamessan/vim-gnupg#81
Signed-off-by: James McCoy <jamessan@jamessan.com>
This commit is contained in:
James McCoy 2017-10-22 23:18:00 -04:00
parent ae1b31965e
commit d3453145c5
No known key found for this signature in database
GPG Key ID: DFE691AE331BA3DB
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugin/gnupg.vim
View File

@ -455,7 +455,7 @@ function s:GPGDecrypt(bufread)
call s:GPGDebug(3, printf(">>>>>>>> Entering s:GPGDecrypt(%d)", a:bufread)) call s:GPGDebug(3, printf(">>>>>>>> Entering s:GPGDecrypt(%d)", a:bufread))
" get the filename of the current buffer " get the filename of the current buffer
let filename = expand("<afile>:p") let filename = resolve(expand("<afile>:p"))
" clear GPGRecipients and GPGOptions " clear GPGRecipients and GPGOptions
if type(g:GPGDefaultRecipients) == type([]) if type(g:GPGDefaultRecipients) == type([])
@ -469,7 +469,7 @@ function s:GPGDecrypt(bufread)
let b:GPGOptions = [] let b:GPGOptions = []
" file name minus extension " file name minus extension
let autocmd_filename = expand('<afile>:r') let autocmd_filename = fnamemodify(filename, ':r')
" File doesn't exist yet, so nothing to decrypt " File doesn't exist yet, so nothing to decrypt
if !filereadable(filename) if !filereadable(filename)
@ -479,6 +479,10 @@ function s:GPGDecrypt(bufread)
call s:GPGDebug(2, 'called BufNewFile autocommand for ' . autocmd_filename) call s:GPGDebug(2, 'called BufNewFile autocommand for ' . autocmd_filename)
set buftype=acwrite set buftype=acwrite
" Remove the buffer name ...
silent 0file
" ... so we can force it to be absolute
exe 'silent file' filename
" This is a new file, so force the user to edit the recipient list if " This is a new file, so force the user to edit the recipient list if
" they open a new file and public keys are preferred " they open a new file and public keys are preferred
@ -605,6 +609,10 @@ function s:GPGDecrypt(bufread)
endif endif
" Ensure the buffer is only saved by using our BufWriteCmd " Ensure the buffer is only saved by using our BufWriteCmd
set buftype=acwrite set buftype=acwrite
" Always set the buffer name to the absolute path, otherwise Vim won't
" track the correct buffer name when changing directories (due to
" buftype=acwrite).
exe 'file' filename
else else
execute silent 'read' fnameescape(filename) execute silent 'read' fnameescape(filename)
endif endif
@ -663,7 +671,7 @@ function s:GPGEncrypt()
endif endif
" file name minus extension " file name minus extension
let autocmd_filename = expand('<afile>:r') let autocmd_filename = expand('<afile>:p:r')
silent exe ':doautocmd '. auType .'Pre '. fnameescape(autocmd_filename) silent exe ':doautocmd '. auType .'Pre '. fnameescape(autocmd_filename)
call s:GPGDebug(2, 'called '. auType .'Pre autocommand for ' . autocmd_filename) call s:GPGDebug(2, 'called '. auType .'Pre autocommand for ' . autocmd_filename)
@ -677,7 +685,7 @@ function s:GPGEncrypt()
return return
endif endif
let filename = resolve(expand('<afile>')) let filename = resolve(expand('<afile>:p'))
" 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 = []
@ -941,7 +949,7 @@ 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 " switch to scratch buffer window
execute 'silent! ' . bufwinnr(expand("<afile>")) . "wincmd w" execute 'silent! ' . bufwinnr(expand("<afile>:p")) . "wincmd w"
endif endif
" delete the autocommand " delete the autocommand
@ -1124,7 +1132,7 @@ 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 " switch to scratch buffer window
execute 'silent! ' . bufwinnr(expand("<afile>")) . "wincmd w" execute 'silent! ' . bufwinnr(expand("<afile>:p")) . "wincmd w"
endif endif
" clear options and unknownOptions " clear options and unknownOptions