* mml2015.el (mml2015-epg-passphrase-callback): Display key ID on the passphrase...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5537cf7..a10e40c 100644 (file)
--- 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.
        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  <yamaoka@jpl.org>
 
 
 2006-11-10  Katsumi Yamaoka  <yamaoka@jpl.org>
 

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index f68af77..5429a27 100644 (file)
--- 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)
 (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
           (passphrase
            (password-read

-            (format "GnuPG passphrase for %s: "
-                    (if entry
-                        (cdr entry)
-                      key-id))

             (if (eq key-id 'PIN)
             (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))
       (when passphrase
        (let ((password-cache-expiry mml2015-passphrase-cache-expiry))
          (password-cache-add key-id passphrase))