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.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 5c8b433333259990926c4fa5a3b2512e1e65b7b5..feee3c49f3aad114e99c1857b6768cd81b2171d1 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2011-08-27  Daiki Ueno  <ueno@unixuser.org>
+
+       * 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  <yamaoka@jpl.org>
 
        * mailcap.el (mailcap-mime-data): Regexp-quote MIME subtype.

diff --git a/lisp/gnus/mml-smime.el b/lisp/gnus/mml-smime.el
index 43c91604ec5578ec997ada3c6e7ef6bf3c74ab0d..7a7b3f6d82d0e18c71ed15b561f186c12dc0ec3d 100644 (file)
--- 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 7d8a4119c0e6842c6582c0899a9231779bd7bbe8..b9310beed588b130117fe479438cdf0527ff6333 100644 (file)
--- 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