From bd29cab82d6aab4721b9c25e854c7efa66c83428 Mon Sep 17 00:00:00 2001 From: ueno Date: Sat, 21 Apr 2007 02:50:16 +0000 Subject: [PATCH] * epa-file.el (epa-file-write-region): Ask recipients only the first time. --- ChangeLog | 5 +++++ epa-file.el | 14 +++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3068586..df0d0a6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-04-21 Daiki Ueno + + * epa-file.el (epa-file-write-region): Ask recipients only the + first time. + 2007-04-19 Daiki Ueno * epa.el (epa-mark-key): Renamed from epa-mark; signal an error if diff --git a/epa-file.el b/epa-file.el index 969cc3b..7c75f7c 100644 --- a/epa-file.el +++ b/epa-file.el @@ -202,7 +202,11 @@ May either be a string or a list of strings.") buffer-file-coding-system))) (context (epg-make-context)) (coding-system-for-write 'binary) - string entry) + string entry + (recipients + (cond + ((listp epa-file-encrypt-to) epa-file-encrypt-to) + ((stringp epa-file-encrypt-to) (list epa-file-encrypt-to))))) (epg-context-set-passphrase-callback context (cons #'epa-file-passphrase-callback-function @@ -217,14 +221,14 @@ May either be a string or a list of strings.") (epa-file--encode-coding-string start coding-system) (epa-file--encode-coding-string (buffer-substring start end) coding-system)) - (unless (assoc file epa-file-passphrase-alist) + (if (local-variable-p 'epa-file-encrypt-to) + (if epa-file-encrypt-to + (epg-list-keys context recipients)) (epa-select-keys context "Select recipents for encryption. If no one is selected, symmetric encryption will be performed. " - (cond - ((listp epa-file-encrypt-to) epa-file-encrypt-to) - ((stringp epa-file-encrypt-to) (list epa-file-encrypt-to))))))) + recipients)))) (error (if (setq entry (assoc file epa-file-passphrase-alist)) (setcdr entry nil)) -- 1.7.10.4