auto upstream

2 files changed, 8 insertions, 1 deletions

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 2916b40df29..46b311b7e03 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/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
diff --git a/lisp/gnus/plstore.el b/lisp/gnus/plstore.el
index 6d5424e833d..f130bfca853 100644
--- a/lisp/gnus/plstore.el
+++ b/lisp/gnus/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
-      (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))