jonas/vim-gnupg
1
0
Fork 0
mirror of https://github.com/Ascyii/vim-gnupg.git synced 2026-01-01 06:14:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tty-cmd-cleanup'

Browse Source 
* Delete all output from "tty" command
* Do not try to run tty command if it doesn't exist
This commit is contained in:
James McCoy
2019-08-25 09:51:28 -04:00
parent 6219a5a0d7 5001a8b45d
commit f663d0e857
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
autoload/gnupg.vim
View File

@@ -1,5 +1,5 @@
" Name: autoload/gnupg.vim " Name: autoload/gnupg.vim
" Last Change: 2019 Feb 11 " Last Change: 2019 Aug 23
" 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.
@@ -213,18 +213,20 @@ function gnupg#init(bufread)
" modified just by detecting the correct tty value. " modified just by detecting the correct tty value.
" Do the &undolevels dance so the :read and :delete don't get added into " Do the &undolevels dance so the :read and :delete don't get added into
" the undo tree, as the user needn't be aware of these. " the undo tree, as the user needn't be aware of these.
if executable('tty')
let [mod, levels] = [&l:modified, &undolevels] let [mod, levels] = [&l:modified, &undolevels]
set undolevels=-1 set undolevels=-1
silent read !tty silent read !tty
let $GPG_TTY = getline('.') let $GPG_TTY = getline('.')
silent delete silent '[,']delete _
let [&l:modified, &undolevels] = [mod, levels] let [&l:modified, &undolevels] = [mod, levels]
" redraw is needed since we're using silent to run !tty, c.f. :help :! " redraw is needed since we're using silent to run !tty, c.f. :help :!
redraw! redraw!
if (v:shell_error) endif
if v:shell_error || !exists("$GPG_TTY")
let $GPG_TTY = "" let $GPG_TTY = ""
echohl GPGWarning echohl GPGWarning
echom "$GPG_TTY is not set and the `tty` command failed! gpg-agent might not work." echom "$GPG_TTY is not set and the `tty` command failed/doesn't exist! gpg-agent might not work."
echohl None echohl None
endif endif
endif endif