procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changes made in Gnus trunk.

Browse source 
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.
This commit is contained in:
Daiki Ueno 2011-08-28 22:04:32 +00:00 • committed by Katsumi Yamaoka
parent fb87e0fb94
commit 0f3de88f02
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lisp/gnus/ChangeLog
View file

@ -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.

2
lisp/gnus/mml-smime.el
View file

@ -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))

2
lisp/gnus/mml2015.el
View file

@ -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