diff options
| author | Daiki Ueno <ueno@unixuser.org> | 2010-10-10 10:45:45 +0900 |
|---|---|---|
| committer | Daiki Ueno <ueno@unixuser.org> | 2010-10-10 10:45:45 +0900 |
| commit | 81bbb30402890040262600e1f5e6de2846daf230 (patch) | |
| tree | 62c310f0633bbe21af423702ff5d2c02f5e04c15 /lisp/epa.el | |
| parent | aedf3af5c68b0728bd3e13335c797c238935d1f0 (diff) | |
| download | emacs-81bbb30402890040262600e1f5e6de2846daf230.tar.gz | |
Simplify r101871.
* epa.el (epa-passphrase-callback-function): Display filename
passed as the 3rd arg.
* epa-file.el (epa-file-passphrase-callback-function): Pass
filename to epa-passphrase-callback-function.
Diffstat (limited to 'lisp/epa.el')
| -rw-r--r-- | lisp/epa.el | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/lisp/epa.el b/lisp/epa.el index 49ff3455c23..ca0f07d5bae 100644 --- a/lisp/epa.el +++ b/lisp/epa.el @@ -637,12 +637,10 @@ If SECRET is non-nil, list secret keys instead of public keys." (if (eq key-id 'SYM) (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)) - ""))) + ;; Add the file name to the prompt, if any. + (if (stringp handback) + (format " for %s" handback) + "")) (eq (epg-context-operation context) 'encrypt)) (read-passwd (if (eq key-id 'PIN) |