mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-11-25 07:28:20 +00:00
Code Issues Releases Activity

Simplify 2010-10-09T13:27:24Z!larsi@gnus.org.

Browse Source 
* 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.
This commit is contained in:
Daiki Ueno 2010-10-10 10:45:45 +09:00
parent f7aa248a5b
commit 446b12da60
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/ChangeLog
View File

@ -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)

5
lisp/epa-file.el
View File

@ -67,10 +67,11 @@ way."
(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)

10
lisp/epa.el
View File

@ -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)