summaryrefslogtreecommitdiff
path: root/lisp/epa.el
diff options
context:
space:
mode:
authorDaiki Ueno <ueno@unixuser.org>2009-06-05 01:58:53 +0000
committerDaiki Ueno <ueno@unixuser.org>2009-06-05 01:58:53 +0000
commit42481bde613cc36ac718954aa3d9f6837a476d3a (patch)
tree88a9d1445039237177835af238744ca8f986ddf4 /lisp/epa.el
parent74830ab74d88b69599805231a2a12e693cfe9833 (diff)
downloademacs-42481bde613cc36ac718954aa3d9f6837a476d3a.tar.gz
(epa-decrypt-region): Detect encoding if
coding-system-for-read is not specified. <http://sourceforge.jp/ticket/browse.php?group_id=2267&tid=17018> (epa-verify-region): Ditto.
Diffstat (limited to 'lisp/epa.el')
-rw-r--r--lisp/epa.el6
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/epa.el b/lisp/epa.el
index 0e8c92390af..36c261a4e26 100644
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -830,7 +830,8 @@ For example:
(setq plain (epa--decode-coding-string
plain
(or coding-system-for-read
- (get-text-property start 'epa-coding-system-used))))
+ (get-text-property start 'epa-coding-system-used)
+ 'undecided)))
(if (y-or-n-p "Replace the original text? ")
(let ((inhibit-read-only t)
buffer-read-only)
@@ -919,7 +920,8 @@ For example:
(setq plain (epa--decode-coding-string
plain
(or coding-system-for-read
- (get-text-property start 'epa-coding-system-used))))
+ (get-text-property start 'epa-coding-system-used)
+ 'undecided)))
(if (y-or-n-p "Replace the original text? ")
(let ((inhibit-read-only t)
buffer-read-only)