From: yamaoka <yamaoka>
Date: Tue, 7 Nov 2000 23:53:43 +0000 (+0000)
Subject: Synch with Gnus.
X-Git-Tag: t-gnus-6_14-quimby-before-installer-changed-~1
X-Git-Url: http://git.chise.org/gitweb/?p=elisp%2Fgnus.git-;a=commitdiff_plain;h=bddf0fef6aaefd0617d2eef37a36b78a3f630d32

Synch with Gnus.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ff59a59..bee3d20 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-07 18:02:26  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+	* mm-uu.el (mm-uu-type-alist): Don't test pgp stuff.
+	(mm-uu-pgp-encrypted-extract): Clean mml2015 buffer.
+
 2000-11-07 14:33:19  ShengHuo ZHU  <zsh@cs.rochester.edu>
 
 	* gnus-art.el (gnus-mime-display-part): Show MIME security button.
diff --git a/lisp/mm-uu.el b/lisp/mm-uu.el
index 46fc4f1..a11f419 100644
--- a/lisp/mm-uu.el
+++ b/lisp/mm-uu.el
@@ -104,13 +104,13 @@ This can be either \"inline\" or \"attachment\".")
      "^-----END PGP SIGNATURE-----"
      mm-uu-pgp-signed-extract
      nil
-     mm-uu-pgp-signed-test)
+     nil)
     (pgp-encrypted
      "^-----BEGIN PGP MESSAGE-----"
      "^-----END PGP MESSAGE-----"
      mm-uu-pgp-encrypted-extract
      nil
-     mm-uu-pgp-encrypted-test)
+     nil)
     (pgp-key
      "^-----BEGIN PGP PUBLIC KEY BLOCK-----"
      "^-----END PGP PUBLIC KEY BLOCK-----"
@@ -262,7 +262,9 @@ To disable dissecting shar codes, for instance, add
     (mm-set-handle-multipart-parameter 
      mm-security-handle 'protocol "application/pgp-signature")
     (with-current-buffer buf
-      (funcall (mml2015-clear-verify-function))
+      (when (mm-uu-pgp-signed-test)
+	(mml2015-clean-buffer)
+	(funcall (mml2015-clear-verify-function)))
       (goto-char (point-min))
       (if (search-forward "\n\n" nil t)
 	  (delete-region (point-min) (point)))
@@ -289,8 +291,10 @@ To disable dissecting shar codes, for instance, add
 	(mm-security-handle (list (format "multipart/encrypted"))))
     (mm-set-handle-multipart-parameter 
      mm-security-handle 'protocol "application/pgp-encrypted")
-    (with-current-buffer buf
-      (funcall (mml2015-clear-decrypt-function)))
+    (if (mm-uu-pgp-encrypted-test)
+	(with-current-buffer buf
+	  (mml2015-clean-buffer)
+	  (funcall (mml2015-clear-decrypt-function))))
     (setcdr mm-security-handle
 	    (list
 	     (mm-make-handle buf