Fixed.

diff --git a/epg-file.el b/epg-file.el
index fc2123f..856af40 100644 (file)
--- a/epg-file.el
+++ b/epg-file.el
@@ -32,7 +32,8 @@ with GnuPG."
                            (epg-file-run-real-handler
                             'write-region (list start end "/"))
                           (file-error (if (boundp 'last-coding-system-used)
-                                         last-coding-system-used))))
+                                         last-coding-system-used
+                                       buffer-file-coding-system))))
          ;; start and end are normally buffer positions
          ;; specifying the part of the buffer to write.
          ;; If start is nil, that means to use the entire buffer contents.
@@ -85,8 +86,8 @@ with GnuPG."
     (when (or (eq visit t) (stringp visit))
       (setq buffer-file-name filename)
       (set-visited-file-modtime))
-    (when (stringp visit)
-      (setq buffer-file-name visit))
+    (if (stringp visit)
+       (setq buffer-file-name visit))
     (when (or (eq visit t) (eq visit nil) (stringp visit))
       (message "Wrote %s" visit-file))
     (if (boundp 'last-coding-system-used)