[Emacs-diffs] /srv/bzr/emacs/trunk r105608: Merge changes made in Gnus trunk.

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 105608
author: Daiki Ueno <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Sun 2011-08-28 22:04:32 +0000
message:
  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.
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/mml-smime.el
  lisp/gnus/mml2015.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2011-08-26 09:01:56 +0000
+++ b/lisp/gnus/ChangeLog       2011-08-28 22:04:32 +0000
@@ -1,3 +1,9 @@
+2011-08-27  Daiki Ueno  <address@hidden>
+
+       * 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  <address@hidden>
 
        * mailcap.el (mailcap-mime-data): Regexp-quote MIME subtype.

=== modified file 'lisp/gnus/mml-smime.el'
--- a/lisp/gnus/mml-smime.el    2011-01-25 04:08:28 +0000
+++ b/lisp/gnus/mml-smime.el    2011-08-28 22:04:32 +0000
@@ -531,7 +531,7 @@
        (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))

=== modified file 'lisp/gnus/mml2015.el'
--- a/lisp/gnus/mml2015.el      2011-06-30 23:27:10 +0000
+++ b/lisp/gnus/mml2015.el      2011-08-28 22:04:32 +0000
@@ -923,7 +923,7 @@
        (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