Fixed.

[elisp/epg.git] / epg.el

diff --git a/epg.el b/epg.el
index 9b42d60..6a3401d 100644 (file)
--- a/epg.el
+++ b/epg.el
@@ -260,7 +260,8 @@ This function is for internal use only."
 
 (defun epg-read-output (context)
   (with-temp-buffer
-    (set-buffer-multibyte nil)
+    (if (fboundp 'set-buffer-multibyte)
+       (set-buffer-multibyte nil))
     (if (file-exists-p (epg-context-output-file context))
        (let ((coding-system-for-read (if (epg-context-textmode context)
                                          'raw-text
@@ -460,11 +461,10 @@ This function is for internal use only."
        "Passphrase for symmetric encryption: "
      (if (eq key-id 'PIN)
         "Passphrase for PIN: "
-       (format "Passphrase for %s: "
-              (let ((entry (assoc key-id epg-user-id-alist)))
-                (if entry
-                    (cdr entry)
-                  key-id)))))))
+       (let ((entry (assoc key-id epg-user-id-alist)))
+        (if entry
+            (format "Passphrase for %s %s: " key-id (cdr entry))
+          (format "Passphrase for %s: " key-id)))))))
 
 (defun epg-progress-callback-function (what char current total handback)
   (message "%s: %d%%/%d%%" what current total))