summaryrefslogtreecommitdiff
path: root/lisp/image-mode.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/image-mode.el')
-rw-r--r--lisp/image-mode.el7
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index e6d6a3edb71..8ef9c277c36 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -658,7 +658,12 @@ was inserted."
(not (and (boundp 'archive-superior-buffer)
archive-superior-buffer))
(not (and (boundp 'tar-superior-buffer)
- tar-superior-buffer)))))
+ tar-superior-buffer))
+ ;; This means the buffer holds the
+ ;; decrypted content (bug#21870).
+ (not (and (boundp 'epa-file-encrypt-to)
+ (local-variable-p
+ 'epa-file-encrypt-to))))))
(file-or-data (if data-p
(string-make-unibyte
(buffer-substring-no-properties (point-min) (point-max)))