From 5e233ad521a7d68abd13f63c00de38075ffcc104 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Fri, 11 Oct 2002 01:21:42 +0000
Subject: [PATCH] Synch with Oort Gnus.

---
 lisp/ChangeLog  |    7 +++++++
 lisp/mml1991.el |    3 +++
 lisp/mml2015.el |   12 ++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 275d684..1d0f8a7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2002-10-11  Simon Josefsson  <jas@extundo.com>
+
+	* mml2015.el (mml2015-pgg-decrypt, mml2015-pgg-clear-decrypt) 
+	(mml2015-pgg-verify, mml2015-pgg-clear-verify): Remove CR.
+
+	* mml1991.el (mml1991-pgg-sign): Remove CR.
+
 2002-10-10  Simon Josefsson  <jas@extundo.com>
 
 	* mml2015.el (mml2015-pgg-decrypt): Set gnus details even when
diff --git a/lisp/mml1991.el b/lisp/mml1991.el
index 04e28c6..ff44132 100644
--- a/lisp/mml1991.el
+++ b/lisp/mml1991.el
@@ -238,6 +238,9 @@
       (error "Encrypt error"))
     (kill-region (point-min) (point-max))
     (insert-buffer pgg-output-buffer)
+    (goto-char (point-min))
+    (while (re-search-forward "\r+$" nil t)
+      (replace-match "" t t))
     (quoted-printable-encode-region (point-min) (point-max))
     (goto-char (point-min))
     (if headers (insert headers))
diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 4272f3f..0f8c5f6 100644
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -673,6 +673,9 @@
 		mm-security-handle 'gnus-details "Quit.")
 	       nil))
 	    (with-current-buffer pgg-output-buffer
+	      (goto-char (point-min))
+	      (while (search-forward "\r\n" nil t)
+		(replace-match "\n" t t))
 	      (setq handles (mm-dissect-buffer t))
 	      (mm-destroy-parts handle)
 	      (mm-set-handle-multipart-parameter
@@ -701,6 +704,9 @@
 	(progn
 	  (erase-buffer)
 	  (insert-buffer pgg-output-buffer)
+	  (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"))
       (mm-set-handle-multipart-parameter
@@ -738,6 +744,9 @@
 		(prog1
 		    (pgg-verify-region (point-min) (point-max)
 				       signature-file t)
+		  (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-details
 		   (concat (with-current-buffer pgg-output-buffer
@@ -771,6 +780,9 @@
 		(mm-with-unibyte-buffer
 		  (insert-buffer text)
 		  (pgg-verify-region (point-min) (point-max) nil t))
+	      (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-details
 	       (concat (with-current-buffer pgg-output-buffer
-- 
1.7.10.4