* 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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 275d684..1d0f8a7 100644 (file)
--- 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 538319c..9e325db 100644 (file)
--- a/lisp/mml1991.el
+++ b/lisp/mml1991.el
@@ -24,7 +24,7 @@
 
 ;;; Commentary:
 
-;; RCS: $Id: mml1991.el,v 6.14 2002/10/10 00:30:36 jas Exp $
+;; RCS: $Id: mml1991.el,v 6.15 2002/10/10 00:54:59 jas Exp $
 
 ;;; Code:
 
@@ -240,6 +240,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 5ee6947..e61ce7d 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -672,6 +672,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
@@ -700,6 +703,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
@@ -737,6 +743,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
@@ -770,6 +779,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