mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-25 07:28:20 +00:00
Code Issues Releases Activity

Extend epa-file-select-keys to allow users to inhibit key selection.

Browse Source 
* epa-file.el (epa-file-select-keys): Accept 'silent to inhibit
key selection prompt; make 'silent as default (Bug#7487).
This commit is contained in:
Daiki Ueno 2010-12-16 11:35:56 +09:00
parent c0e505e559
commit 33088bedf3
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2010-12-16 Daiki Ueno <ueno@unixuser.org>
* epa-file.el (epa-file-select-keys): Accept 'silent to inhibit
key selection prompt; make 'silent as default (Bug#7487).
2010-12-16 Leo <sdl.web@gmail.com>
* eshell/eshell.el (eshell-directory-name): Use

20
lisp/epa-file.el
View File

@ -35,9 +35,16 @@ way."
:type 'boolean
:group 'epa-file)
(defcustom epa-file-select-keys nil
"If non-nil, always asks user to select recipients."
:type 'boolean
(defcustom epa-file-select-keys 'silent
"Control whether or not to pop up the key selection dialog.
If t, always asks user to select recipients.
If nil, query user only when `epa-file-encrypt-to' is not set.
If neither t nor nil, doesn't ask user. In this case, symmetric
encryption is used."
:type '(choice (const :tag "Ask always" t)
(const :tag "Ask when recipients are not set" nil)
(const :tag "Don't ask" silent))
:group 'epa-file)
(defvar epa-file-passphrase-alist nil)
@ -218,9 +225,10 @@ way."
end (point-max)))
(epa-file--encode-coding-string (buffer-substring start end)
coding-system))
(if (or epa-file-select-keys
(not (local-variable-p 'epa-file-encrypt-to
(current-buffer))))
(if (or (eq epa-file-select-keys t)
(and (null epa-file-select-keys)
(not (local-variable-p 'epa-file-encrypt-to
(current-buffer)))))
(epa-select-keys
context
"Select recipents for encryption.