From f233ec1f4c2046e19b9a53fdd34f0103ab856ea9 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 13 May 2002 22:30:23 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 7 +++++++ lisp/mml.el | 2 +- lisp/nnml.el | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ee1e5e4..c71e0c8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2002-05-13 Josh Huber + + * mml.el (mml-generate-mime-1): Fix mml generation for signed only + messages. From Hans de Graaff . + * nnml.el (nnml-request-accept-article): Pass in the group name to + nnmail-cache-insert, since it's available. + 2002-05-10 ShengHuo ZHU * nndoc.el (nndoc-mime-digest-type-p): Set proper file-end. diff --git a/lisp/mml.el b/lisp/mml.el index 8a0c8ac..528acc1 100644 --- a/lisp/mml.el +++ b/lisp/mml.el @@ -540,7 +540,7 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." (message-options-set 'message-sender sender)) (if (setq recipients (cdr (assq 'recipients cont))) (message-options-set 'message-recipients recipients)) - (let ((style (mml-signencrypt-style (first encrypt-item)))) + (let ((style (mml-signencrypt-style (first (or sign-item encrypt-item))))) ;; check if: we're both signing & encrypting, both methods ;; are the same (why would they be different?!), and that ;; the signencrypt style allows for combined operation. diff --git a/lisp/nnml.el b/lisp/nnml.el index d27213f..7a1b531 100644 --- a/lisp/nnml.el +++ b/lisp/nnml.el @@ -375,7 +375,7 @@ marks file will be regenerated properly by Gnus.") (nnmail-check-syntax) (let (result) (when nnmail-cache-accepted-message-ids - (nnmail-cache-insert (nnmail-fetch-field "message-id"))) + (nnmail-cache-insert (nnmail-fetch-field "message-id") group)) (if (stringp group) (and (nnmail-activate 'nnml) -- 1.7.10.4