[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 58e6235: * lisp/image-mode.el: Support encrypted fi
From: |
Daiki Ueno |
Subject: |
[Emacs-diffs] master 58e6235: * lisp/image-mode.el: Support encrypted file |
Date: |
Tue, 17 Nov 2015 02:49:21 +0000 |
branch: master
commit 58e6235007e6761fb9734b942ecff94bf4e9ba68
Author: Daiki Ueno <address@hidden>
Commit: Daiki Ueno <address@hidden>
* 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)
---
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 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)))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 58e6235: * lisp/image-mode.el: Support encrypted file,
Daiki Ueno <=