Mercurial > emacs
changeset 110877:f60f4abe5849
(epa-passphrase-callback-function): Say what we're querying the password for.
| author | Lars Magne Ingebrigtsen <larsi@gnus.org> |
|---|---|
| date | Sat, 09 Oct 2010 15:27:24 +0200 |
| parents | f6e34c8648a7 |
| children | 39b6f8749957 |
| files | lisp/ChangeLog lisp/epa.el |
| diffstat | 2 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sat Oct 09 15:23:29 2010 +0200 +++ b/lisp/ChangeLog Sat Oct 09 15:27:24 2010 +0200 @@ -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.
--- a/lisp/epa.el Sat Oct 09 15:23:29 2010 +0200 +++ b/lisp/epa.el Sat Oct 09 15:27:24 2010 +0200 @@ -635,8 +635,15 @@ (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: "