Fixed.

[elisp/epg.git] / epa-file.el

diff --git a/epa-file.el b/epa-file.el
index 202ccdf..b1b2681 100644 (file)
--- a/epa-file.el
+++ b/epa-file.el
@@ -40,8 +40,7 @@
 (defun epa-file-passphrase-callback-function (key-id buffer)
   (save-excursion
     (set-buffer buffer)
-    (if (and (eq key-id 'SYM)
-            epa-file)
+    (if (eq key-id 'SYM)
        (or epa-passphrase
            (let ((passphrase (epg-passphrase-callback-function
                               key-id buffer)))
@@ -52,58 +51,66 @@
 (defvar last-coding-system-used)
 (defun epa-find-file ()
   (when (string-match epa-file-name-regexp (buffer-file-name))
-    (when (file-exists-p (expand-file-name (buffer-file-name)))
-      (if (fboundp 'set-buffer-multibyte)
-         (set-buffer-multibyte t))
-      (goto-char (point-min))
-      (let ((context (epg-make-context)))
+    (if (file-exists-p (expand-file-name (buffer-file-name)))
+       (let ((context (epg-make-context))
+             passphrase)
+         (if (fboundp 'set-buffer-multibyte)
+             (set-buffer-multibyte t))
+         (goto-char (point-min))
+         (epg-context-set-passphrase-callback
+          context
+          (cons #'epa-file-passphrase-callback-function
+                (current-buffer)))
+         (make-local-variable 'epa-passphrase)
+         (insert (epg-decrypt-file context
+                                   (expand-file-name (buffer-file-name))
+                                   nil))
+         (setq passphrase epa-passphrase)
+         (delete-region (point) (point-max))
+         (decode-coding-region (point-min) (point-max) 'undecided)
+         (if (boundp 'last-coding-system-used)
+             (set-buffer-file-coding-system last-coding-system-used)
+           (set-buffer-file-coding-system default-buffer-file-coding-system))
+         (set-auto-mode)
+         (hack-local-variables)
+         (auto-save-mode nil)
+         (set-buffer-modified-p nil)
+         (setq buffer-undo-list nil)
+         (make-local-variable 'epa-passphrase)
+         (setq epa-passphrase passphrase)))
+    (make-local-variable 'epa-passphrase)
+    (make-local-variable 'epa-file)
+    (setq epa-file (buffer-file-name))))
+
+(defun epa-write-file ()
+  (if epa-file
+      (let* ((coding-system (if (boundp 'last-coding-system-used)
+                               (condition-case nil
+                                   (write-region (point-min) (point-max) "/")
+                                 (error last-coding-system-used))
+                             buffer-file-coding-system))
+            (context (epg-make-context))
+            (coding-system-for-write 'binary))
        (epg-context-set-passphrase-callback
         context
         (cons #'epa-file-passphrase-callback-function
               (current-buffer)))
-       (insert (epg-decrypt-file context
-                                 (expand-file-name (buffer-file-name))
-                                 nil)))
-      (delete-region (point) (point-max))
-      (decode-coding-region (point-min) (point-max) 'undecided)
-      (if (boundp 'last-coding-system-used)
-         (set-buffer-file-coding-system last-coding-system-used))
-      (set-auto-mode)
-      (hack-local-variables)
-      (auto-save-mode nil)
-      (set-buffer-modified-p nil)
-      (setq buffer-undo-list nil))
-    (make-local-variable 'epa-file)
-    (setq epa-file (buffer-file-name))
-    (make-local-variable 'epa-passphrase)))
-
-(defun epa-write-file ()
-  (when epa-file
-    (let* ((coding-system (if (boundp 'last-coding-system-used)
-                             (condition-case nil
-                                 (write-region (point-min) (point-max) "/")
-                               (error last-coding-system-used))
-                           buffer-file-coding-system))
-          (coding-system-for-write 'binary)
-          (context (epg-make-context)))
-      (epg-context-set-passphrase-callback
-       context
-       (cons #'epa-file-passphrase-callback-function
-            (current-buffer)))
-      (write-region
-       (epg-encrypt-string
-       context
-       (encode-coding-string (buffer-string) coding-system)
-       (mapcar (lambda (key)
-                 (epg-sub-key-id (car (epg-key-sub-key-list key))))
-               (unless epa-passphrase
-                 (epa-select-keys
-                  "Select recipents for encryption.
+       (write-region
+        (epg-encrypt-string
+         context
+         (encode-coding-string (buffer-string) coding-system)
+         (mapcar (lambda (key)
+                   (epg-sub-key-id (car (epg-key-sub-key-list key))))
+                 (unless epa-passphrase
+                   (epa-select-keys
+                    "Select recipents for encryption.
 If no one is selected, symmetric encryption will be performed.  "))))
-       nil (expand-file-name (buffer-file-name))))
-    (set-visited-file-modtime)
-    (set-buffer-modified-p nil)
-    t))
+        nil (expand-file-name (buffer-file-name)))
+       (if (boundp 'last-coding-system-used)
+           (setq last-coding-system-used coding-system))
+       (set-visited-file-modtime)
+       (set-buffer-modified-p nil)
+       t)))
 
 (provide 'epa-file)