(mml2015-epg-clear-decrypt): Don't append verify results

to the gnus-info.  This fixes a bug of inline-PGP message verification.
Reported by Michael Piotrowski <mxp@dynalabs.de>.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index eb3350b..4cc2335 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-11  Daiki Ueno  <ueno@unixuser.org>
+
+       * mml2015.el (mml2015-epg-clear-decrypt): Don't append verify results
+       to the gnus-info.  This fixes a bug of inline-PGP message verification.
+       Reported by Michael Piotrowski <mxp@dynalabs.de>.
+
 2006-09-09  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * pop3.el (pop3-leave-mail-on-server): Mention problem of duplicate

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 3332270..e4de5fd 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -1053,14 +1053,13 @@ Whether the passphrase is cached at all is controlled by
       (goto-char (point-min))
       (while (search-forward "\r\n" nil t)
        (replace-match "\n" t t))
+      (mm-set-handle-multipart-parameter
+       mm-security-handle 'gnus-info "OK")
       (if (epg-context-result-for context 'verify)
          (mm-set-handle-multipart-parameter
-          mm-security-handle 'gnus-info
-          (concat "OK\n"
-                  (epg-verify-result-to-string
-                   (epg-context-result-for context 'verify))))
-       (mm-set-handle-multipart-parameter
-        mm-security-handle 'gnus-info "OK")))))
+          mm-security-handle 'gnus-details
+          (epg-verify-result-to-string
+           (epg-context-result-for context 'verify)))))))
 
 (defun mml2015-epg-verify (handle ctl)
   (catch 'error