summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorRichard Stallman <rms@gnu.org>2015-08-12 11:19:47 -0400
committerRichard Stallman <rms@gnu.org>2015-08-12 11:19:47 -0400
commit472addd6f2b693e171fc5096d78dbca1536bfb8e (patch)
treec17419515c7ad811ec07b7be54b526fcb74c004a /lisp
parentbf3f6a961f378f35a292c41c0bfbdae88ee1b1b9 (diff)
downloademacs-472addd6f2b693e171fc5096d78dbca1536bfb8e.tar.gz
epa-inhibit inhibits auto-recognition of .gpg files
* lisp/epa-file.el (epa-inhibit): New variable. (epa-file-handler): Check epa-inhibit.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/epa-file.el7
1 files changed, 5 insertions, 2 deletions
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)