From 733550914b151d9744ec45287b434af023f3e6d4 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Mon, 13 Nov 2006 02:42:17 +0000 Subject: [PATCH] * mml2015.el (mml2015-epg-passphrase-callback): Display key ID on the passphrase prompt. --- lisp/ChangeLog | 2 ++ lisp/mml2015.el | 12 +++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 5537cf787..a10e40c56 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -4,6 +4,8 @@ EasyPG (< 0.0.6). (mml2015-encrypt-to-self): Turn on by default. (mml2015-always-trust): New user option. + (mml2015-epg-passphrase-callback): Display key ID on the passphrase + prompt. 2006-11-10 Katsumi Yamaoka diff --git a/lisp/mml2015.el b/lisp/mml2015.el index f68af7762..5429a27a4 100644 --- a/lisp/mml2015.el +++ b/lisp/mml2015.el @@ -956,16 +956,14 @@ Whether the passphrase is cached at all is controlled by (defun mml2015-epg-passphrase-callback (context key-id ignore) (if (eq key-id 'SYM) (epg-passphrase-callback-function context key-id nil) - (let* ((entry (assoc key-id epg-user-id-alist)) + (let* (entry (passphrase (password-read - (format "GnuPG passphrase for %s: " - (if entry - (cdr entry) - key-id)) (if (eq key-id 'PIN) - "PIN" - key-id)))) + "Passphrase for PIN: " + (if (setq entry (assoc key-id epg-user-id-alist)) + (format "Passphrase for %s %s: " key-id (cdr entry)) + (format "Passphrase for %s: " key-id)))))) (when passphrase (let ((password-cache-expiry mml2015-passphrase-cache-expiry)) (password-cache-add key-id passphrase)) -- 2.25.1