From 0f3de88f02fd5107b34dd653668099a7d8b3e7bb Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Sun, 28 Aug 2011 22:04:32 +0000 Subject: [PATCH] Merge changes made in Gnus trunk. mml-smime.el (mml-smime-epg-verify): Don't use the 4th arg of mm-replace-in-string for compatibility issues. mml2015.el (mml2015-epg-verify): Ditto. --- lisp/gnus/ChangeLog | 6 ++++++ lisp/gnus/mml-smime.el | 2 +- lisp/gnus/mml2015.el | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 5c8b4333332..feee3c49f3a 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,9 @@ +2011-08-27 Daiki Ueno + + * mml-smime.el (mml-smime-epg-verify): Don't use the 4th arg of + mm-replace-in-string for compatibility issues. + * mml2015.el (mml2015-epg-verify): Ditto. + 2011-08-26 Katsumi Yamaoka * mailcap.el (mailcap-mime-data): Regexp-quote MIME subtype. diff --git a/lisp/gnus/mml-smime.el b/lisp/gnus/mml-smime.el index 43c91604ec5..7a7b3f6d82d 100644 --- a/lisp/gnus/mml-smime.el +++ b/lisp/gnus/mml-smime.el @@ -531,7 +531,7 @@ Content-Disposition: attachment; filename=smime.p7m (mm-set-handle-multipart-parameter mm-security-handle 'gnus-info "Corrupted") (throw 'error handle)) - (setq part (mm-replace-in-string part "\n" "\r\n" t) + (setq part (mm-replace-in-string part "\n" "\r\n") context (epg-make-context 'CMS)) (condition-case error (setq plain (epg-verify-string context (mm-get-part signature) part)) diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el index 7d8a4119c0e..b9310beed58 100644 --- a/lisp/gnus/mml2015.el +++ b/lisp/gnus/mml2015.el @@ -923,7 +923,7 @@ If set, it overrides the setting of `mml2015-sign-with-sender'." (mm-set-handle-multipart-parameter mm-security-handle 'gnus-info "Corrupted") (throw 'error handle)) - (setq part (mm-replace-in-string part "\n" "\r\n" t) + (setq part (mm-replace-in-string part "\n" "\r\n") signature (mm-get-part signature) context (epg-make-context)) (condition-case error -- 2.39.2