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

(epa-passphrase-callback-function): Say what we're querying the password for.

This commit is contained in:
Lars Magne Ingebrigtsen 2010-10-09 15:27:24 +02:00
parent cf321e508b
commit 7450df5dfc
2 changed files with 12 additions and 2 deletions

View File

@ -1,5 +1,8 @@
2010-10-09 Lars Magne Ingebrigtsen <larsi@gnus.org>
* epa.el (epa-passphrase-callback-function): Say what we're
querying the password for.
* ibuffer.el (ibuffer-visit-buffer): To mimick list-buffers
behaviour, don't bury the ibuffer buffer when visiting other
buffers.

View File

@ -635,8 +635,15 @@ If SECRET is non-nil, list secret keys instead of public keys."
(defun epa-passphrase-callback-function (context key-id handback)
(if (eq key-id 'SYM)
(read-passwd "Passphrase for symmetric encryption: "
(eq (epg-context-operation context) 'encrypt))
(read-passwd
(format "Passphrase for symmetric encryption%s: "
(let ((elem (epg-context-passphrase-callback context)))
;; Add the file name to the prompt, if any.
(if (and (consp elem)
(stringp (cdr elem)))
(format " for %s" (cdr elem))
"")))
(eq (epg-context-operation context) 'encrypt))
(read-passwd
(if (eq key-id 'PIN)
"Passphrase for PIN: "