Mercurial > emacs
changeset 110899:beddb591d182
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.
| author | Daiki Ueno <ueno@unixuser.org> |
|---|---|
| date | Sun, 10 Oct 2010 10:45:45 +0900 |
| parents | 069deed4cdec |
| children | 0ddc8e23dddd |
| files | lisp/ChangeLog lisp/epa-file.el lisp/epa.el |
| diffstat | 3 files changed, 14 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun Oct 10 00:15:21 2010 +0000 +++ b/lisp/ChangeLog Sun Oct 10 10:45:45 2010 +0900 @@ -1,3 +1,10 @@ +2010-10-10 Daiki Ueno <ueno@unixuser.org> + + * 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. + 2010-10-09 Chong Yidong <cyd@stupidchicken.com> * cus-edit.el (custom-face-widget-to-spec)
--- a/lisp/epa-file.el Sun Oct 10 00:15:21 2010 +0000 +++ b/lisp/epa-file.el Sun Oct 10 10:45:45 2010 +0900 @@ -67,10 +67,11 @@ (cons entry epa-file-passphrase-alist))) (setq passphrase (epa-passphrase-callback-function context - key-id nil)) + key-id + file)) (setcdr entry (copy-sequence passphrase)) passphrase)))) - (epa-passphrase-callback-function context key-id nil))) + (epa-passphrase-callback-function context key-id file))) ;;;###autoload (defun epa-file-handler (operation &rest args)
--- a/lisp/epa.el Sun Oct 10 00:15:21 2010 +0000 +++ b/lisp/epa.el Sun Oct 10 10:45:45 2010 +0900 @@ -637,12 +637,10 @@ (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)