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

Make use of fnameescape()

Browse Source
This commit is contained in:
Markus Braun 2011-07-05 12:45:44 +02:00
parent 4340361541
commit 7afa048df7
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
plugin/gnupg.vim
View File

@ -67,7 +67,7 @@
" "
" Section: Plugin header {{{1 " Section: Plugin header {{{1
if v:version < 700 if v:version < 700
echohl ErrorMsg | echo 'plugin gnupg.vim requires Vim version >= 7' | echohl None echohl ErrorMsg | echo 'plugin gnupg.vim requires Vim version >= 7.0' | echohl None
finish finish
endif endif
@ -169,7 +169,7 @@ function s:GPGInit()
" setup shell environment for unix and windows " setup shell environment for unix and windows
let s:shellredirsave=&shellredir let s:shellredirsave=&shellredir
let s:shellsave=&shell let s:shellsave=&shell
if (match(&shell,"\\(cmd\\|command\\).exe") >= 0) if (match(&shell,"\\(cmd\\|command\\).execute") >= 0)
" windows specific settings " windows specific settings
let s:shellredir = '>%s' let s:shellredir = '>%s'
let s:shell = &shell let s:shell = &shell
@ -204,7 +204,7 @@ function s:GPGDecrypt()
set bin set bin
" get the filename of the current buffer " get the filename of the current buffer
let filename=escape(expand("%:p"), '\"') let filename=fnameescape(expand("%:p"))
" clear GPGEncrypted, GPGRecipients, GPGUnknownRecipients and GPGOptions " clear GPGEncrypted, GPGRecipients, GPGUnknownRecipients and GPGOptions
let b:GPGEncrypted=0 let b:GPGEncrypted=0
@ -302,8 +302,8 @@ function s:GPGDecrypt()
set nobin set nobin
" call the autocommand for the file minus .gpg$ " call the autocommand for the file minus .gpg$
execute ":doautocmd BufReadPost " . escape(expand("%:r"), ' *?\"'."'") execute ":doautocmd BufReadPost " . fnameescape(expand("%:r"))
call s:GPGDebug(2, "called autocommand for " . escape(expand("%:r"), ' *?\"'."'")) call s:GPGDebug(2, "called autocommand for " . fnameescape(expand("%:r")))
" refresh screen " refresh screen
redraw! redraw!
@ -526,17 +526,17 @@ function s:GPGEditRecipients()
" check if this buffer exists " check if this buffer exists
if (!bufexists(editbuffername)) if (!bufexists(editbuffername))
" create scratch buffer " create scratch buffer
exe 'silent! split ' . escape(editbuffername, ' *?\"'."'") execute 'silent! split ' . fnameescape(editbuffername)
" 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,BufUnload,BufWriteCmd <buffer> call s:GPGFinishRecipientsBuffer()
else else
if (bufwinnr(editbuffername) >= 0) if (bufwinnr(editbuffername) >= 0)
" switch to scratch buffer window " switch to scratch buffer window
exe 'silent! ' . bufwinnr(editbuffername) . "wincmd w" execute 'silent! ' . bufwinnr(editbuffername) . "wincmd w"
else else
" split scratch buffer window " split scratch buffer window
exe 'silent! sbuffer ' . escape(editbuffername, ' *?\"'."'") execute 'silent! sbuffer ' . fnameescape(editbuffername)
" 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,BufUnload,BufWriteCmd <buffer> call s:GPGFinishRecipientsBuffer()
@ -627,7 +627,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
exe 'silent! ' . bufwinnr(expand("<afile>")) . "wincmd w" execute 'silent! ' . bufwinnr(expand("<afile>")) . "wincmd w"
endif endif
" clear GPGRecipients and GPGUnknownRecipients " clear GPGRecipients and GPGUnknownRecipients
@ -732,17 +732,17 @@ function s:GPGEditOptions()
" check if this buffer exists " check if this buffer exists
if (!bufexists(editbuffername)) if (!bufexists(editbuffername))
" create scratch buffer " create scratch buffer
exe 'silent! split ' . escape(editbuffername, ' *?\"'."'") execute 'silent! split ' . fnameescape(editbuffername)
" 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,BufUnload,BufWriteCmd <buffer> call s:GPGFinishOptionsBuffer()
else else
if (bufwinnr(editbuffername) >= 0) if (bufwinnr(editbuffername) >= 0)
" switch to scratch buffer window " switch to scratch buffer window
exe 'silent! ' . bufwinnr(editbuffername) . "wincmd w" execute 'silent! ' . bufwinnr(editbuffername) . "wincmd w"
else else
" split scratch buffer window " split scratch buffer window
exe 'silent! sbuffer ' . escape(editbuffername, ' *?\"'."'") execute 'silent! sbuffer ' . fnameescape(editbuffername)
" 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,BufUnload,BufWriteCmd <buffer> call s:GPGFinishOptionsBuffer()
@ -810,7 +810,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
exe 'silent! ' . bufwinnr(expand("<afile>")) . "wincmd w" execute 'silent! ' . bufwinnr(expand("<afile>")) . "wincmd w"
endif endif
" clear GPGOptions and GPGUnknownOptions " clear GPGOptions and GPGUnknownOptions