# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1552775533 14400
# Node ID 648b37626788c2b16dbad4742171e2f15c1b96e8
# Parent  a3c2fbf5a6237ae57612a1e2e212b4cfb6bfcc7d
Backed out changeset 63fedee268a7

diff --git a/.vim/ftdetect/gpg.vim b/.vim/ftdetect/gpg.vim
deleted file mode 100644
--- a/.vim/ftdetect/gpg.vim
+++ /dev/null
@@ -1,1 +0,0 @@
-autocmd BufRead,BufNewFile *.gpg,*.gpg.wiki  setfiletype gpg
diff --git a/.vim/ftplugin/gpg.vim b/.vim/ftplugin/gpg.vim
deleted file mode 100644
--- a/.vim/ftplugin/gpg.vim
+++ /dev/null
@@ -1,14 +0,0 @@
-" based on
-" https://mjj.io/2015/01/27/encrypting-files-with-gpg-and-vim/
-" hacked to work with vimwiki
-" moved to ftplugin
-
-setl noswapfile noundofile nobackup viminfo=
-
-sil %!GPG_TTY=/dev/tty gpg2 --decrypt 2>/dev/null
-
-augroup GPGWriteEncrypted
-  autocmd!
-  autocmd BufWritePre *.gpg,*.gpg.wiki :sil %!GPG_TTY=/dev/tty gpg2 -se -a --default-recipient-self 2>/dev/null
-  autocmd BufWritePost *.gpg,*.gpg.wiki :sil undo
-augroup END
diff --git a/.vimrc b/.vimrc
--- a/.vimrc
+++ b/.vimrc
@@ -294,6 +294,17 @@ augroup vimrc
   autocmd BufNewFile,BufRead neomutt-*-\w\+ setf mail
 augroup END
 
+" https://mjj.io/2015/01/27/encrypting-files-with-gpg-and-vim/
+" hacked to work with vimwiki
+augroup encrypted
+  autocmd!
+  autocmd BufReadPre,FileReadPre *.gpg,*.gpg.wiki setl noswapfile noundofile nobackup viminfo=
+  autocmd BufReadPost *.gpg,*.gpg.wiki :sil %!GPG_TTY=/dev/tty gpg2 --decrypt 2> /dev/null
+  autocmd BufWritePre *.gpg,*.gpg.wiki :sil %!GPG_TTY=/dev/tty gpg2 -se -a --default-recipient-self
+  autocmd BufWritePost *.gpg,*.gpg.wiki :sil undo
+augroup END
+"}}}
+
 " Perl type-specific settings  {{{
 let perl_include_pod     = 1
 let perl_sub_signatures  = 1