From cd72a291f811ca624ddfa2efb25c97f29cd7f2cb Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 3 Sep 2002 14:59:18 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 7 +++++++ lisp/gnus-msg.el | 8 ++++---- lisp/mml.el | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a1bd2ba..5a03ddf 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2002-09-03 Josh Huber + + * gnus-msg.el (gnus-summary-handle-replysign): Change the order we + check for signed and encrypted parts. + * mml.el (mml-parse-1): Correct small typo which preventing + setting recipients in a secure tag. + 2002-09-03 Katsumi Yamaoka * mm-util.el (mm-coding-system-priorities): Default to a list of diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el index cdac772..8411a41 100644 --- a/lisp/gnus-msg.el +++ b/lisp/gnus-msg.el @@ -1178,13 +1178,13 @@ If VERY-WIDE, make a very wide reply." (set-buffer gnus-article-buffer) (setq signed (memq 'signed gnus-article-wash-types)) (setq encrypted (memq 'encrypted gnus-article-wash-types))) - (cond ((and gnus-message-replysign signed) - (mml-secure-message mml-default-sign-method 'sign)) - ((and gnus-message-replyencrypt encrypted) + (cond ((and gnus-message-replyencrypt encrypted) (mml-secure-message mml-default-encrypt-method (if gnus-message-replysignencrypted 'signencrypt - 'encrypt))))))) + 'encrypt))) + ((and gnus-message-replysign signed) + (mml-secure-message mml-default-sign-method 'sign)))))) (defun gnus-summary-reply-with-original (n &optional wide) "Start composing a reply mail to the current message. diff --git a/lisp/mml.el b/lisp/mml.el index 99d4115..d97ec34 100644 --- a/lisp/mml.el +++ b/lisp/mml.el @@ -173,7 +173,7 @@ one charsets.") (setq tags (list "sign" method "encrypt" method)))) (eval `(mml-insert-tag ,secure-mode ,@tags - ,(if recipients 'recipients) + ,(if recipients "recipients") ,recipients)) ;; restart the parse (goto-char location))) -- 1.7.10.4