From: Richard Stallman <rms@gnu.org>
Date: Wed, 12 Aug 2015 15:19:47 +0000 (-0400)
Subject: epa-inhibit inhibits auto-recognition of .gpg files
X-Git-Tag: emacs-25.0.90~1373^2~56
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=472addd6f2b693e171fc5096d78dbca1536bfb8e;p=emacs.git

epa-inhibit inhibits auto-recognition of .gpg files

* lisp/epa-file.el (epa-inhibit): New variable.
(epa-file-handler): Check epa-inhibit.
---

diff --git a/lisp/epa-file.el b/lisp/epa-file.el
index db8613aec97..88d25a570b3 100644
--- a/lisp/epa-file.el
+++ b/lisp/epa-file.el
@@ -82,12 +82,15 @@ encryption is used."
 		passphrase))))
     (epa-passphrase-callback-function context key-id file)))
 
+(defvar epa-inhibit nil
+  "Non-nil means don't try to decrypt .gpg files when operating on them.")
+
 ;;;###autoload
 (defun epa-file-handler (operation &rest args)
   (save-match-data
     (let ((op (get operation 'epa-file)))
-      (if op
-  	  (apply op args)
+      (if (and op (not epa-inhibit))
+          (apply op args)
   	(epa-file-run-real-handler operation args)))))
 
 (defun epa-file-run-real-handler (operation args)