changeset 103324:6f4c24703dac

(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.
author Daiki Ueno <ueno@unixuser.org>
date Fri, 05 Jun 2009 01:58:53 +0000
parents 3ad71a3c2535
children dbcad43aecdd
files lisp/ChangeLog lisp/epa.el
diffstat 2 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Thu Jun 04 23:21:22 2009 +0000
+++ b/lisp/ChangeLog	Fri Jun 05 01:58:53 2009 +0000
@@ -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
--- a/lisp/epa.el	Thu Jun 04 23:21:22 2009 +0000
+++ b/lisp/epa.el	Fri Jun 05 01:58:53 2009 +0000
@@ -830,7 +830,8 @@
       (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 @@
     (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)