Fixed.

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

diff --git a/epa-file.el b/epa-file.el
index 777a1a9..4d6df44 100644 (file)
--- a/epa-file.el
+++ b/epa-file.el
@@ -55,6 +55,11 @@ does that automatically."
   :type 'boolean
   :group 'epa-file)
 
+(defcustom epa-file-select-keys nil
+  "If non-nil, always asks user to select recipients."
+  :type 'boolean
+  :group 'epa-file)
+
 (defvar epa-file-encrypt-to nil
   "*Recipient(s) used for encrypting files.
 May either be a string or a list of strings.")
@@ -71,18 +76,26 @@ May either be a string or a list of strings.")
                        val)
                  t)))))
 
+;;;###autoload
+(put 'epa-file-encrypt-to 'permanent-local t)
+
 (defvar epa-file-handler
   (cons epa-file-name-regexp 'epa-file-handler))
 
+(defvar epa-file-auto-mode-alist-entry
+  (list epa-file-name-regexp nil 'epa-file))
+
 (defvar epa-file-passphrase-alist nil)
 
-(if (fboundp 'encode-coding-string)
-    (defalias 'epa-file--encode-coding-string 'encode-coding-string)
-  (defalias 'epa-file--encode-coding-string 'identity))
+(eval-and-compile
+  (if (fboundp 'encode-coding-string)
+      (defalias 'epa-file--encode-coding-string 'encode-coding-string)
+    (defalias 'epa-file--encode-coding-string 'identity)))
 
-(if (fboundp 'decode-coding-string)
-    (defalias 'epa-file--decode-coding-string 'decode-coding-string)
-  (defalias 'epa-file--decode-coding-string 'identity))
+(eval-and-compile
+  (if (fboundp 'decode-coding-string)
+      (defalias 'epa-file--decode-coding-string 'decode-coding-string)
+    (defalias 'epa-file--decode-coding-string 'identity)))
 
 (defun epa-file-name-regexp-update ()
   (interactive)
@@ -142,15 +155,19 @@ May either be a string or a list of strings.")
   (if (and visit (or beg end))
       (error "Attempt to visit less than an entire file"))
   (setq file (expand-file-name file))
-  (let ((local-copy (epa-file-run-real-handler #'file-local-copy (list file)))
-       (context (epg-make-context))
-       string length entry)
+  (let* ((local-copy
+         (condition-case inl
+             (epa-file-run-real-handler #'file-local-copy (list file))
+           (error)))
+        (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
-          file))
+          local-file))
     (epg-context-set-progress-callback context
                                       #'epa-progress-callback-function)
     (unwind-protect
@@ -158,12 +175,15 @@ May either be a string or a list of strings.")
          (if replace
              (goto-char (point-min)))
          (condition-case error
-             (setq string (epg-decrypt-file context file nil))
+             (setq string (epg-decrypt-file context local-file nil))
            (error
             (if (setq entry (assoc file epa-file-passphrase-alist))
                 (setcdr entry nil))
             (signal 'file-error
                     (cons "Opening input file" (cdr error)))))
+         (make-local-variable 'epa-file-encrypt-to)
+         (setq epa-file-encrypt-to
+               (mapcar #'car (epg-context-result-for context 'encrypted-to)))
          (if (or beg end)
              (setq string (substring string (or beg 0) end)))
          (save-excursion
@@ -196,13 +216,18 @@ May either be a string or a list of strings.")
                              buffer-file-coding-system)))
         (context (epg-make-context))
         (coding-system-for-write 'binary)
-        string entry)
+        string entry
+        (recipients
+         (cond
+          ((listp epa-file-encrypt-to) epa-file-encrypt-to)
+          ((stringp epa-file-encrypt-to) (list epa-file-encrypt-to)))))
     (epg-context-set-passphrase-callback
      context
      (cons #'epa-file-passphrase-callback-function
           file))
     (epg-context-set-progress-callback context
                                       #'epa-progress-callback-function)
+    (epg-context-set-armor context epa-armor)
     (condition-case error
        (setq string
              (epg-encrypt-string
@@ -211,14 +236,16 @@ May either be a string or a list of strings.")
                   (epa-file--encode-coding-string start coding-system)
                 (epa-file--encode-coding-string (buffer-substring start end)
                                                 coding-system))
-              (unless (assoc file epa-file-passphrase-alist)
-                (epa-select-keys
-                 context
-                 "Select recipents for encryption.
+              (if (or epa-file-select-keys
+                      (not (local-variable-p 'epa-file-encrypt-to
+                                             (current-buffer))))
+                  (epa-select-keys
+                   context
+                   "Select recipents for encryption.
 If no one is selected, symmetric encryption will be performed.  "
-                 (cond
-                  ((listp epa-file-encrypt-to) epa-file-encrypt-to)
-                  ((stringp epa-file-encrypt-to) (list epa-file-encrypt-to)))))))
+                   recipients)
+                (if epa-file-encrypt-to
+                    (epg-list-keys context recipients)))))
       (error
        (if (setq entry (assoc file epa-file-passphrase-alist))
           (setcdr entry nil))
@@ -246,7 +273,18 @@ If no one is selected, symmetric encryption will be performed.  "
   (if (and buffer-file-name
           (string-match epa-file-name-regexp buffer-file-name)
           epa-file-inhibit-auto-save)
-      (auto-save-mode 0)))
+      (auto-save-mode 0))
+  (set-buffer-modified-p nil))
+
+(defun epa-file-select-keys ()
+  "Select recipients for encryption."
+  (interactive)
+  (make-local-variable 'epa-file-encrypt-to)
+  (setq epa-file-encrypt-to
+       (epa-select-keys
+        (epg-make-context)
+        "Select recipents for encryption.
+If no one is selected, symmetric encryption will be performed.  ")))
 
 ;;;###autoload
 (defun epa-file-enable ()
@@ -256,6 +294,7 @@ If no one is selected, symmetric encryption will be performed.  "
     (setq file-name-handler-alist
          (cons epa-file-handler file-name-handler-alist))
     (add-hook 'find-file-hooks 'epa-file-find-file-hook)
+    (setq auto-mode-alist (cons epa-file-auto-mode-alist-entry auto-mode-alist))
     (message "`epa-file' enabled")))
 
 ;;;###autoload
@@ -266,6 +305,8 @@ If no one is selected, symmetric encryption will be performed.  "
        (setq file-name-handler-alist
              (delq epa-file-handler file-name-handler-alist))
        (remove-hook 'find-file-hooks 'epa-file-find-file-hook)
+       (setq auto-mode-alist (delq epa-file-auto-mode-alist-entry
+                                   auto-mode-alist))
        (message "`epa-file' disabled"))
     (message "`epa-file' already disabled")))