diff options
| author | Daiki Ueno <ueno@gnu.org> | 2015-11-17 11:27:51 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@gnu.org> | 2015-11-17 11:27:51 +0900 |
| commit | 58e6235007e6761fb9734b942ecff94bf4e9ba68 (patch) | |
| tree | 3845ad7c82d211fc4c7b33d2638204b39b4c9701 | |
| parent | 937565268a5dc3377d4c9bff6d48eb3645a77160 (diff) | |
| download | emacs-58e6235007e6761fb9734b942ecff94bf4e9ba68.tar.gz | |
* 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)
| -rw-r--r-- | lisp/image-mode.el | 7 |
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))) |