plstore-passphrase-callback-function fixup

* plstore.el (plstore-passphrase-callback-function): Fix error when
error when plstore-cache-passphrase-for-symmetric-encryption is set
(bug#13264).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a9127c8..4bef403 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2012-12-25  Leo Liu  <sdl.web@gmail.com>
+
+       * plstore.el (plstore-passphrase-callback-function): Fix error when
+       error when plstore-cache-passphrase-for-symmetric-encryption is set
+       (bug#13264).
+

 2012-12-25  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-sum.el (gnus-set-global-variables): Don't copy over the summary
 2012-12-25  Lars Ingebrigtsen  <larsi@gnus.org>
 
        * gnus-sum.el (gnus-set-global-variables): Don't copy over the summary

diff --git a/lisp/plstore.el b/lisp/plstore.el
index 6d5424e..f130bfc 100644 (file)
--- a/lisp/plstore.el
+++ b/lisp/plstore.el
@@ -126,7 +126,8 @@ symmetric encryption will be used.")
 
 (defun plstore-passphrase-callback-function (_context _key-id plstore)
   (if plstore-cache-passphrase-for-symmetric-encryption
 
 (defun plstore-passphrase-callback-function (_context _key-id plstore)
   (if plstore-cache-passphrase-for-symmetric-encryption

-      (let* ((file (file-truename (plstore--get-buffer plstore)))
+      (let* ((file (file-truename (buffer-file-name
+                                  (plstore--get-buffer plstore))))

             (entry (assoc file plstore-passphrase-alist))
             passphrase)
        (or (copy-sequence (cdr entry))
             (entry (assoc file plstore-passphrase-alist))
             passphrase)
        (or (copy-sequence (cdr entry))