From 50e1d4047f7bd318716bdcf814e4463d7cc59521 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Mon, 13 Nov 2006 01:48:55 +0000 Subject: [PATCH] * mml2015.el (mml2015-epg-encrypt): Removed backward compatibility for EasyPG (< 0.0.6). --- lisp/ChangeLog | 5 +++++ lisp/mml2015.el | 27 +++++++++++---------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index cda80891f..778c067d8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2006-11-13 Daiki Ueno + + * mml2015.el (mml2015-epg-encrypt): Removed backward compatibility for + EasyPG (< 0.0.6). + 2006-11-10 Katsumi Yamaoka * nntp.el (nntp-authinfo-force): New variable. diff --git a/lisp/mml2015.el b/lisp/mml2015.el index e4de5fdd2..0e5501227 100644 --- a/lisp/mml2015.el +++ b/lisp/mml2015.el @@ -1168,25 +1168,20 @@ If no one is selected, default secret key is used. " (defun mml2015-epg-encrypt (cont &optional sign) (let ((inhibit-redisplay t) (context (epg-make-context)) - (recipients - (if (message-options-get 'message-recipients) - (split-string - (message-options-get 'message-recipients) - "[ \f\t\n\r\v,]+"))) - cipher signers config + (config (epg-configuration)) + (recipients (split-string + (or (message-options-get 'message-recipients) + (message-options-set 'message-recipients + (read-string "Recipients: "))) + "[ \f\t\n\r\v,]+")) + cipher signers (boundary (mml-compute-boundary cont))) - ;; We should remove this check if epg-0.0.6 is released. - (if (and (condition-case nil - (require 'epg-config) - (error)) - (functionp #'epg-expand-group)) - (setq config (epg-configuration) - recipients - (apply #'nconc - (mapcar (lambda (recipient) + (setq recipients (apply #'nconc + (mapcar + (lambda (recipient) (or (epg-expand-group config recipient) (list recipient))) - recipients)))) + recipients))) (if mml2015-verbose (setq recipients (epa-select-keys context "Select recipients for encryption. -- 2.34.1