From f1001aa90980bb96dd5a736535eaf4bbf47e8d3b Mon Sep 17 00:00:00 2001 From: ShengHuo ZHU Date: Wed, 1 Nov 2000 12:13:25 +0000 Subject: [PATCH] 2000-11-01 08:01:03 ShengHuo ZHU * mml2015.el (mml2015-mailcrypt-encrypt): Use from and sign parameter. * mml.el (mml-generate-mime-1): Add sender and recipients attribute. --- lisp/ChangeLog | 5 +++++ lisp/mml.el | 14 ++++++++++++-- lisp/mml2015.el | 11 ++++++++++- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6a399e794..702ab029b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2000-11-01 08:01:03 ShengHuo ZHU + + * mml2015.el (mml2015-mailcrypt-encrypt): Use from and sign parameter. + * mml.el (mml-generate-mime-1): Add sender and recipients attribute. + 2000-11-01 07:39:24 ShengHuo ZHU * gnus-sum.el (gnus-summary-force-verify-and-decrypt): New function. diff --git a/lisp/mml.el b/lisp/mml.el index 1218523f7..8bb4a1aed 100644 --- a/lisp/mml.el +++ b/lisp/mml.el @@ -396,11 +396,21 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." (insert "\n--" mml-boundary "--\n"))))) (t (error "Invalid element: %S" cont))) - (let ((item (assoc (cdr (assq 'sign cont)) mml-sign-alist))) + (let ((item (assoc (cdr (assq 'sign cont)) mml-sign-alist)) + sender recipients) (when item + (if (setq sender (cdr (assq 'sender cont))) + (message-options-set 'message-sender sender)) + (if (setq recipients (cdr (assq 'recipients cont))) + (message-options-set 'message-sender recipients)) (funcall (nth 1 item) cont))) - (let ((item (assoc (cdr (assq 'encrypt cont)) mml-encrypt-alist))) + (let ((item (assoc (cdr (assq 'encrypt cont)) mml-encrypt-alist)) + sender recipients) (when item + (if (setq sender (cdr (assq 'sender cont))) + (message-options-set 'message-sender sender)) + (if (setq recipients (cdr (assq 'recipients cont))) + (message-options-set 'message-sender recipients)) (funcall (nth 1 item) cont)))))) (defun mml-compute-boundary (cont) diff --git a/lisp/mml2015.el b/lisp/mml2015.el index 6ef9ddea2..6d37aba23 100644 --- a/lisp/mml2015.el +++ b/lisp/mml2015.el @@ -59,6 +59,7 @@ (eval-and-compile (autoload 'mailcrypt-decrypt "mailcrypt") (autoload 'mailcrypt-verify "mailcrypt") + (autoload 'mc-pgp-always-sign "mailcrypt") (autoload 'mc-encrypt-generic "mc-toplev") (autoload 'mc-cleanup-recipient-headers "mc-toplev") (autoload 'mc-sign-generic "mc-toplev")) @@ -156,7 +157,15 @@ (or (message-options-get 'message-recipients) (message-options-set 'message-recipients (mc-cleanup-recipient-headers - (read-string "Recipients: "))))) + (read-string "Recipients: ")))) + nil nil nil + (message-options-get 'message-sender) + (or mc-pgp-always-sign + (eq t + (or (message-options-get 'message-sign-encrypt) + (message-options-set 'message-sign-encrypt + (or (y-or-n-p "Sign the message? ") + 'not)))))) (let ((boundary (funcall mml-boundary-function (incf mml-multipart-number)))) (goto-char (point-min)) -- 2.25.1