From 6ddbffa5b12b6283d58b0f1fe12f783af58b53eb Mon Sep 17 00:00:00 2001 From: ueno Date: Sun, 30 Apr 2006 04:44:51 +0000 Subject: [PATCH] * 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 . [cf. ] --- ChangeLog | 10 ++++++++++ mime-pgp.el | 11 +++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 939c83a..53cbab9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2006-04-30 Daiki Ueno + + * 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 . + [cf. ] + 2006-04-23 Daiki Ueno * 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))))) -- 1.7.10.4