From: ueno <ueno>
Date: Sun, 30 Apr 2006 04:44:51 +0000 (+0000)
Subject: * mime-pgp.el: Require 'epa.
X-Git-Tag: emiko-1_14_1-epg-0_0_2~4
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=6ddbffa5b12b6283d58b0f1fe12f783af58b53eb;p=elisp%2Fsemi.git

* mime-pgp.el: Require 'epa.
(mime-verify-application/*-signature): Supply required arguments
to buffer-substring.
(mime-view-application/pgp): Convert line endings of the decrypted
text.
Thanks to Hiroya Murata <lapis-lazuli@pop06.odn.ne.jp>.
[cf. <emacs-mime-ja:02027>]
---

diff --git a/ChangeLog b/ChangeLog
index 939c83a..53cbab9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2006-04-30  Daiki Ueno  <ueno@unixuser.org>
+
+	* mime-pgp.el: Require 'epa.
+	(mime-verify-application/*-signature): Supply required arguments
+	to buffer-substring.
+	(mime-view-application/pgp): Convert line endings of the decrypted
+	text.
+	Thanks to Hiroya Murata <lapis-lazuli@pop06.odn.ne.jp>.
+	[cf. <emacs-mime-ja:02027>]
+
 2006-04-23  Daiki Ueno  <ueno@unixuser.org>
 
 	* mime-pgp.el (mime-verify-application/*-signature): New function.
diff --git a/mime-pgp.el b/mime-pgp.el
index e66c2f4..0fbf1ad 100644
--- a/mime-pgp.el
+++ b/mime-pgp.el
@@ -52,6 +52,7 @@
 
 (require 'mime-play)
 (require 'epg)
+(require 'epa)
 
 ;;; @ Internal method for multipart/signed
 ;;;
@@ -110,9 +111,11 @@
 	     (re-search-forward "^-+BEGIN PGP MESSAGE-+$" nil t))
 	   (setq context (epg-make-context))
 	   (setq plain
-		 (epg-decrypt-string
-		  context
-		  (buffer-substring (point-min)(point-max))))
+		 (decode-coding-string
+		  (epg-decrypt-string
+		   context
+		   (buffer-substring (point-min)(point-max)))
+		  'raw-text))
 	   (delete-region (point-min)(point-max))
 	   (insert plain)
 	   (setq representation-type 'binary)))
@@ -151,7 +154,7 @@
 			 (goto-char (point-min))
 			 (while (search-forward "\n" nil t)
 			   (replace-match "\r\n"))
-			 (buffer-substring)))
+			 (buffer-substring (point-min) (point-max))))
     (message "%s"
 	     (epg-verify-result-to-string
 	      (epg-context-result-for context 'verify)))))