* epa-file.el (epa-file-insert-file-contents): Set

buffer-file-name before decrypting a file.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 38514d0b0a33f286ddbefaf96eb3ad5657d2ceed..3a3657b4b84d328ba1093d963a7449780c18f8b4 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-17  Daiki Ueno  <ueno@unixuser.org>
+
+       * epa-file.el (epa-file-insert-file-contents): Set
+       buffer-file-name before decrypting a file.
+
 2008-12-16  Juanma Barranquero  <lekktu@gmail.com>
 
        * server.el (server-start): If unable to start the server,

diff --git a/lisp/epa-file.el b/lisp/epa-file.el
index 968b22cc52b6bd04f6c953a98e4be5587f202ee0..93b6e5bb767bc9df34b020e58d28b304aab3bd38 100644 (file)
--- a/lisp/epa-file.el
+++ b/lisp/epa-file.el
@@ -110,6 +110,8 @@
         (local-file (or local-copy file))
         (context (epg-make-context))
         string length entry)
+    (if visit
+       (setq buffer-file-name file))
     (epg-context-set-passphrase-callback
      context
      (cons #'epa-file-passphrase-callback-function
@@ -139,9 +141,8 @@
              (setq length (- (point-max) (point-min))))
            (if replace
                (delete-region (point) (point-max)))
-           (when visit
-             (setq buffer-file-name file)
-             (set-visited-file-modtime))))
+           (if visit
+               (set-visited-file-modtime))))
       (if (and local-copy
               (file-exists-p local-copy))
          (delete-file local-copy)))