(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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ac0a752..8e2dbe5 100644 (file)
--- 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 0e8c923..36c261a 100644 (file)
--- 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)