X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=epa-file.el;h=ff5b65fa9f67cf6f2c3e37785195c3993173397e;hb=6e164d33d0237c8236db853fa03528fb29c7e0cd;hp=d02e7890a168eecd9819e09d6af3aff34d83b0fa;hpb=a435a82ee2ae8ce526c53aa18b9e92e2ff9da22b;p=elisp%2Fepg.git

diff --git a/epa-file.el b/epa-file.el
index d02e789..ff5b65f 100644
--- a/epa-file.el
+++ b/epa-file.el
@@ -34,13 +34,19 @@
   :type 'regexp
   :group 'epa-file)
 
+(defcustom epa-file-cache-passphrase-for-symmetric-encryption nil
+  "If t, cache passphrase for symmetric encryption."
+  :type 'boolean
+  :group 'epa-file)
+
 (defvar epa-file-handler
   (cons epa-file-name-regexp 'epa-file-handler))
-  
+
 (defvar epa-file-passphrase-alist nil)
 
 (defun epa-file-passphrase-callback-function (context key-id file)
-  (if (eq key-id 'SYM)
+  (if (and epa-file-cache-passphrase-for-symmetric-encryption
+	   (eq key-id 'SYM))
       (let ((entry (assoc file epa-file-passphrase-alist))
 	    passphrase)
 	(or (copy-sequence (cdr entry))
@@ -49,11 +55,11 @@
 		(setq entry (list file)
 		      epa-file-passphrase-alist (cons entry
 						 epa-file-passphrase-alist)))
-	      (setq passphrase (epg-passphrase-callback-function context
+	      (setq passphrase (epa-passphrase-callback-function context
 								 key-id nil))
 	      (setcdr entry (copy-sequence passphrase))
 	      passphrase)))
-    (epg-passphrase-callback-function context key-id nil)))
+    (epa-passphrase-callback-function context key-id nil)))
 
 (defun epa-file-handler (operation &rest args)
   (save-match-data
@@ -70,6 +76,21 @@
 	(inhibit-file-name-operation operation))
     (apply operation args)))
 
+(defun epa-file-decode-and-insert (string file visit beg end replace)
+  (if (fboundp 'decode-coding-inserted-region)
+      (save-restriction
+	(narrow-to-region (point) (point))
+	(let ((multibyte enable-multibyte-characters))
+	  (set-buffer-multibyte nil)
+	  (insert string)
+	  (set-buffer-multibyte multibyte)
+	  (decode-coding-inserted-region
+	   (point-min) (point-max)
+	   (substring file 0 (string-match epa-file-name-regexp file))
+	   visit beg end replace)))
+    (insert (decode-coding-string string (or coding-system-for-read
+					     'undecided)))))
+
 (defvar last-coding-system-used)
 (defun epa-file-insert-file-contents (file &optional visit beg end replace)
   (barf-if-buffer-read-only)
@@ -85,6 +106,8 @@
      context
      (cons #'epa-file-passphrase-callback-function
 	   file))
+    (epg-context-set-progress-callback context
+				       #'epa-progress-callback-function)
     (unwind-protect
 	(progn
 	  (if replace
@@ -98,22 +121,11 @@
 		     (cons "Opening input file" (cdr error)))))
 	  (if (or beg end)
 	      (setq string (substring string (or beg 0) end)))
-	  (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))
 	  (save-excursion
-	    (if (and (null coding-system-for-read)
-		     (fboundp 'decode-coding-inserted-region))
-		(save-restriction
-		  (narrow-to-region (point) (point))
-		  (insert string)
-		  (decode-coding-inserted-region
-		   (point-min) (point-max)
-		   (substring file 0 (string-match epa-file-name-regexp file))
-		   visit beg end replace))
-	      (insert (decode-coding-string string (or coding-system-for-read
-						       'undecided))))
-	    (setq length (length string))
+	    (save-restriction
+	      (narrow-to-region (point) (point))
+	      (epa-file-decode-and-insert string file visit beg end replace)
+	      (setq length (- (point-max) (point-min))))
 	    (if replace
 		(delete-region (point) (point-max)))))
       (if (and local-copy
@@ -140,6 +152,8 @@
      context
      (cons #'epa-file-passphrase-callback-function
 	   file))
+    (epg-context-set-progress-callback context
+				       #'epa-progress-callback-function)
     (condition-case error
 	(setq string
 	      (epg-encrypt-string