X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=epa-file.el;h=d4c9fb262fe926c474606f55300d396e4b9162a2;hb=359180decf50389e8a5313a3fb04c88a6a93f69e;hp=92324261f915efef04aa9b6dfc23bf2bff0ee041;hpb=ba4aabffde23b88b9e7e87019977f3f68ccf097e;p=elisp%2Fepg.git

diff --git a/epa-file.el b/epa-file.el
index 9232426..d4c9fb2 100644
--- a/epa-file.el
+++ b/epa-file.el
@@ -33,6 +33,9 @@
   "Regexp which matches filenames to be encrypted with GnuPG."
   :type 'regexp
   :group 'epa-file)
+
+(defvar epa-file-handler
+  (cons epa-file-name-regexp 'epa-file-handler))
   
 (defvar epa-file-passphrase-alist nil)
 
@@ -74,7 +77,7 @@
   (setq file (expand-file-name file))
   (let ((local-copy (epa-file-run-real-handler #'file-local-copy (list file)))
 	(context (epg-make-context))
-	point length entry)
+	string length entry)
     (if visit
 	(setq buffer-file-name file))
     (epg-context-set-passphrase-callback
@@ -85,20 +88,22 @@
 	(progn
 	  (if replace
 	      (goto-char (point-min)))
-	  (setq point (point))
 	  (condition-case error
-	      (insert (epg-decrypt-file context file nil))
-	    (error (signal 'file-error
-			   (cons "Opening input file"
-				 (nthcdr 2 error)))))
-	  (setq length (- (point) point))
-	  (if replace
-	      (delete-region (point) (point-max)))
-	  (decode-coding-region point (point) 'undecided)
+	      (setq string (decode-coding-string
+			    (epg-decrypt-file context file nil)
+			    'undecided))
+	    (error
+	     (if (setq entry (assoc file epa-file-passphrase-alist))
+		 (setcdr entry nil))
+	     (signal 'file-error
+		     (cons "Opening input file" (cdr error)))))
 	  (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))
-	  (goto-char point))
+	  (insert string)
+	  (setq length (length string))
+	  (if replace
+	      (delete-region (point) (point-max))))
       (if (and local-copy
 	       (file-exists-p local-copy))
 	  (delete-file local-copy)))
@@ -116,23 +121,31 @@
 			      (error last-coding-system-used))
 			  buffer-file-coding-system))
 	 (context (epg-make-context))
-	 (coding-system-for-write 'binary))
+	 (coding-system-for-write 'binary)
+	 string entry)
     (epg-context-set-passphrase-callback
      context
      (cons #'epa-file-passphrase-callback-function
 	   file))
+    (condition-case error
+	(setq string
+	      (epg-encrypt-string
+	       context
+	       (if (stringp start)
+		   (encode-coding-string start coding-system)
+		 (encode-coding-string (buffer-substring start end)
+				       coding-system))
+	       (unless (assoc file epa-file-passphrase-alist)
+			 (epa-select-keys
+		    "Select recipents for encryption.
+If no one is selected, symmetric encryption will be performed.  "))))
+      (error
+       (if (setq entry (assoc file epa-file-passphrase-alist))
+	   (setcdr entry nil))
+       (signal 'file-error (cons "Opening output file" (cdr error)))))
     (epa-file-run-real-handler
      #'write-region
-     (list (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 (assoc file epa-file-passphrase-alist)
-		      (epa-select-keys
-		       "Select recipents for encryption.
-If no one is selected, symmetric encryption will be performed.  "))))
-	   nil file append visit lockname mustbenew))
+     (list string nil file append visit lockname mustbenew))
     (if (boundp 'last-coding-system-used)
 	(setq last-coding-system-used coding-system))
     (if (eq visit t)
@@ -149,6 +162,25 @@ If no one is selected, symmetric encryption will be performed.  "))))
 	(message "Wrote %s" buffer-file-name))))
 (put 'write-region 'epa-file 'epa-file-write-region)
 
+;;;###autoload
+(defun epa-file-enable ()
+  (interactive)
+  (if (memq epa-file-handler file-name-handler-alist)
+      (message "`epa-file' already enabled")
+    (setq file-name-handler-alist
+	  (cons epa-file-handler file-name-handler-alist))
+    (message "`epa-file' enabled")))
+
+;;;###autoload
+(defun epa-file-disable ()
+  (interactive)
+  (if (memq epa-file-handler file-name-handler-alist)
+      (progn
+	(setq file-name-handler-alist
+	      (delq epa-file-handler file-name-handler-alist))
+	(message "`epa-file' disabled"))
+    (message "`epa-file' already disabled")))
+
 (provide 'epa-file)
 
 ;;; epa-file.el ends here