commit 58e6235007e6761fb9734b942ecff94bf4e9ba68 (HEAD, refs/remotes/origin/master)
Author: Daiki Ueno <ueno@gnu.org>
Date:   Tue Nov 17 11:27:51 2015 +0900

    * lisp/image-mode.el: Support encrypted file
    
    (image-toggle-display-image): Read content from the buffer instead
    of the file, if the buffer holds a decrypted data.  (Bug#21870)

diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index e6d6a3e..8ef9c27 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)))