* epa-file.el (epa-file-write-region): Ask recipients only the

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

diff --git a/epa-file.el b/epa-file.el
index 18e28be..7c75f7c 100644 (file)
--- a/epa-file.el
+++ b/epa-file.el
@@ -29,10 +29,21 @@
   "The EasyPG Assistant hooks for transparent file encryption"
   :group 'epa)
 
-(defcustom epa-file-name-regexp "\\.gpg\\'"
-  "Regexp which matches filenames to be encrypted with GnuPG."
+(defun epa-file--file-name-regexp-set (variable value)
+  (set-default variable value)
+  (if (fboundp 'epa-file-name-regexp-update)
+      (epa-file-name-regexp-update)))
+
+(defcustom epa-file-name-regexp "\\.gpg\\(~\\|\\.~[0-9]+~\\)?\\'"
+  "Regexp which matches filenames to be encrypted with GnuPG.
+
+If you set this outside Custom while epa-file is already enabled, you
+have to call `epa-file-name-regexp-update' after setting it to
+properly update file-name-handler-alist.  Setting this through Custom
+does that automatically."
   :type 'regexp
-  :group 'epa-file)
+  :group 'epa-file
+  :set 'epa-file--file-name-regexp-set)
 
 (defcustom epa-file-cache-passphrase-for-symmetric-encryption nil
   "If non-nil, cache passphrase for symmetric encryption."
@@ -60,6 +71,9 @@ 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))
 
@@ -73,6 +87,11 @@ May either be a string or a list of strings.")
     (defalias 'epa-file--decode-coding-string 'decode-coding-string)
   (defalias 'epa-file--decode-coding-string 'identity))
 
+(defun epa-file-name-regexp-update ()
+  (interactive)
+  (unless (equal (car epa-file-handler) epa-file-name-regexp)
+    (setcar epa-file-handler epa-file-name-regexp)))
+
 (defun epa-file-passphrase-callback-function (context key-id file)
   (if (and epa-file-cache-passphrase-for-symmetric-encryption
           (eq key-id 'SYM))
@@ -148,6 +167,9 @@ May either be a string or a list of strings.")
                 (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
@@ -180,7 +202,11 @@ 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
@@ -195,14 +221,14 @@ 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)
+              (if (local-variable-p 'epa-file-encrypt-to)
+                  (if epa-file-encrypt-to
+                      (epg-list-keys context recipients))
                 (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))))
       (error
        (if (setq entry (assoc file epa-file-passphrase-alist))
           (setcdr entry nil))