diff options
| author | Daiki Ueno <ueno@unixuser.org> | 2009-06-05 01:58:53 +0000 |
|---|---|---|
| committer | Daiki Ueno <ueno@unixuser.org> | 2009-06-05 01:58:53 +0000 |
| commit | 42481bde613cc36ac718954aa3d9f6837a476d3a (patch) | |
| tree | 88a9d1445039237177835af238744ca8f986ddf4 | |
| parent | 74830ab74d88b69599805231a2a12e693cfe9833 (diff) | |
| download | emacs-42481bde613cc36ac718954aa3d9f6837a476d3a.tar.gz emacs-42481bde613cc36ac718954aa3d9f6837a476d3a.tar.bz2 emacs-42481bde613cc36ac718954aa3d9f6837a476d3a.zip | |
(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.
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/epa.el | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ac0a752a36f..8e2dbe5e7bc 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2009-06-05 Daiki Ueno <ueno@unixuser.org> + + * epa.el (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. + 2009-06-04 Stefan Monnier <monnier@iro.umontreal.ca> * tar-mode.el (tar-header-block-tokenize): Obey @LongLink even for 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) |