[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r100861: Fix multiple-recipient handl
From: |
Daiki Ueno |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r100861: Fix multiple-recipient handling of Gnus S/MIME. |
Date: |
Wed, 21 Jul 2010 14:56:18 +0900 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100861
committer: Daiki Ueno <address@hidden>
branch nick: trunk
timestamp: Wed 2010-07-21 14:56:18 +0900
message:
Fix multiple-recipient handling of Gnus S/MIME.
* mml.el (mml-parse-1): Collect "certfile" attributes in "<#secure>" tag
(Bug#6654).
modified:
lisp/gnus/ChangeLog
lisp/gnus/mml.el
=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog 2010-07-20 11:13:25 +0000
+++ b/lisp/gnus/ChangeLog 2010-07-21 05:56:18 +0000
@@ -1,3 +1,8 @@
+2010-07-21 Daiki Ueno <address@hidden>
+
+ * mml.el (mml-parse-1): Collect "certfile" attributes in "<#secure>"
+ tag (Bug#6654).
+
2010-07-20 Katsumi Yamaoka <address@hidden>
* gnus-sum.el (gnus-summary-bookmark-make-record): Bookmark position in
=== modified file 'lisp/gnus/mml.el'
--- a/lisp/gnus/mml.el 2010-05-06 04:15:34 +0000
+++ b/lisp/gnus/mml.el 2010-07-21 05:56:18 +0000
@@ -228,7 +228,10 @@
(let* (secure-mode
(taginfo (mml-read-tag))
(keyfile (cdr (assq 'keyfile taginfo)))
- (certfile (cdr (assq 'certfile taginfo)))
+ (certfiles (delq nil (mapcar (lambda (tag)
+ (if (eq (car-safe tag) 'certfile)
+ (cdr tag)))
+ taginfo)))
(recipients (cdr (assq 'recipients taginfo)))
(sender (cdr (assq 'sender taginfo)))
(location (cdr (assq 'tag-location taginfo)))
@@ -254,8 +257,10 @@
,@tags
,(if keyfile "keyfile")
,keyfile
- ,(if certfile "certfile")
- ,certfile
+ ,@(apply #'append
+ (mapcar (lambda (certfile)
+ (list "certfile" certfile))
+ certfiles))
,(if recipients "recipients")
,recipients
,(if sender "sender")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r100861: Fix multiple-recipient handling of Gnus S/MIME.,
Daiki Ueno <=