[Emacs-diffs] /srv/bzr/emacs/trunk r101871: (epa-passphrase-callback-function): Say what we're querying the password for.

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 101871
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Sat 2010-10-09 15:27:24 +0200
message:
  (epa-passphrase-callback-function): Say what we're querying the password for.
modified:
  lisp/ChangeLog
  lisp/epa.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-10-09 13:23:29 +0000
+++ b/lisp/ChangeLog    2010-10-09 13:27:24 +0000
@@ -1,5 +1,8 @@
 2010-10-09  Lars Magne Ingebrigtsen  <address@hidden>
 
+       * 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.

=== modified file 'lisp/epa.el'
--- a/lisp/epa.el       2010-05-25 17:53:37 +0000
+++ b/lisp/epa.el       2010-10-09 13:27:24 +0000
@@ -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: "