From af3d7d4d2913ca0273ce857f12f4d13c3da7298b Mon Sep 17 00:00:00 2001 From: yamaoka Date: Fri, 12 Jan 2001 13:40:21 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 5 +++++ lisp/mml2015.el | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9831cdd..caf3c20 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2001-01-11 23:00:00 ShengHuo ZHU + + * mml2015.el (mml2015-gpg-encrypt): Remove CR. + (mml2015-gpg-sign): Ditto. + 2001-01-10 14:00:00 ShengHuo ZHU * gnus.el: Sync with EMACS_PRETEST_21_0_95. diff --git a/lisp/mml2015.el b/lisp/mml2015.el index 126f647..0b49560 100644 --- a/lisp/mml2015.el +++ b/lisp/mml2015.el @@ -415,6 +415,9 @@ (unless (> (point-max) (point-min)) (pop-to-buffer mml2015-result-buffer) (error "Sign error."))) + (goto-char (point-min)) + (while (re-search-forward "\r+$" nil t) + (replace-match "" t t)) (set-buffer text) (goto-char (point-min)) (insert (format "Content-Type: multipart/signed; boundary=\"%s\";\n" @@ -452,6 +455,9 @@ (unless (> (point-max) (point-min)) (pop-to-buffer mml2015-result-buffer) (error "Encrypt error."))) + (goto-char (point-min)) + (while (re-search-forward "\r+$" nil t) + (replace-match "" t t)) (set-buffer text) (delete-region (point-min) (point-max)) (insert (format "Content-Type: multipart/encrypted; boundary=\"%s\";\n" -- 1.7.10.4