[Emacs-diffs] /srv/bzr/emacs/trunk r111329: lisp/gnus/plstore.el (plstore-passphrase-callback-function): Fix error when

[Katsumi Yamaoka]

------------------------------------------------------------
revno: 111329
author: Leo Liu <address@hidden>
committer: Katsumi Yamaoka <address@hidden>
branch nick: trunk
timestamp: Tue 2012-12-25 22:23:10 +0000
message:
  lisp/gnus/plstore.el (plstore-passphrase-callback-function): Fix error when
    error when plstore-cache-passphrase-for-symmetric-encryption is set
    (bug#13264).
modified:
  lisp/gnus/ChangeLog
  lisp/gnus/plstore.el

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2012-12-25 22:12:59 +0000
+++ b/lisp/gnus/ChangeLog       2012-12-25 22:23:10 +0000
@@ -1,3 +1,9 @@
+2012-12-25  Leo Liu  <address@hidden>
+
+       * 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  <address@hidden>
 
        * gnus-sum.el (gnus-set-global-variables): Don't copy over the summary

=== modified file 'lisp/gnus/plstore.el'
--- a/lisp/gnus/plstore.el      2012-04-26 22:07:59 +0000
+++ b/lisp/gnus/plstore.el      2012-12-25 22:23:10 +0000
@@ -126,7 +126,8 @@
 
 (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))