diff options
| author | Daiki Ueno <ueno@unixuser.org> | 2011-08-28 22:04:32 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2011-08-28 22:04:32 +0000 |
| commit | 0f3de88f02fd5107b34dd653668099a7d8b3e7bb (patch) | |
| tree | bae095c8081ef064e6a3358680a3faac9fc93a01 /lisp/gnus/mml-smime.el | |
| parent | fb87e0fb94a5ec2018c677a91c62eebea5a978eb (diff) | |
| download | emacs-0f3de88f02fd5107b34dd653668099a7d8b3e7bb.tar.gz | |
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.
Diffstat (limited to 'lisp/gnus/mml-smime.el')
| -rw-r--r-- | lisp/gnus/mml-smime.el | 2 |
1 files changed, 1 insertions, 1 deletions
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)) |