[Emacs-diffs] /srv/bzr/emacs/trunk r101893: Simplify r101871.

[Daiki Ueno]

------------------------------------------------------------
revno: 101893
committer: Daiki Ueno <address@hidden>
branch nick: trunk
timestamp: Sun 2010-10-10 10:45:45 +0900
message:
  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.
modified:
  lisp/ChangeLog
  lisp/epa-file.el
  lisp/epa.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-10-09 21:54:20 +0000
+++ b/lisp/ChangeLog    2010-10-10 01:45:45 +0000
@@ -1,3 +1,10 @@
+2010-10-10  Daiki Ueno  <address@hidden>
+
+       * 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  <address@hidden>
 
        * cus-edit.el (custom-face-widget-to-spec)

=== modified file 'lisp/epa-file.el'
--- a/lisp/epa-file.el  2010-09-13 10:44:07 +0000
+++ b/lisp/epa-file.el  2010-10-10 01:45:45 +0000
@@ -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)

=== modified file 'lisp/epa.el'
--- a/lisp/epa.el       2010-10-09 13:27:24 +0000
+++ b/lisp/epa.el       2010-10-10 01:45:45 +0000
@@ -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)