X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=epa-file.el;h=4a59d8df9e1f31d0c04fa94d808c021bf9eb23b5;hb=ce51acba4dd3b6d91477ce4fdb39d43989856492;hp=86af182ee2955c67a5e7376103e8c287011ea18b;hpb=f0cf0f951e5534b14c3a798424ff6fdc40ad39a8;p=elisp%2Fepg.git

diff --git a/epa-file.el b/epa-file.el
index 86af182..4a59d8d 100644
--- a/epa-file.el
+++ b/epa-file.el
@@ -1,4 +1,4 @@
-;;; epa-file.el --- the EasyPG Assistant hooks for transparent file encryption
+;;; epa-file.el --- the EasyPG Assistant, transparent file encryption
 ;; Copyright (C) 2006 Daiki Ueno
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
@@ -39,8 +39,8 @@
   
 (defvar epa-file-passphrase-alist nil)
 
-(defun epa-file-passphrase-callback-function (file)
-  (if (eq epg-key-id 'SYM)
+(defun epa-file-passphrase-callback-function (context key-id file)
+  (if (eq key-id 'SYM)
       (let ((entry (assoc file epa-file-passphrase-alist))
 	    passphrase)
 	(or (copy-sequence (cdr entry))
@@ -49,10 +49,11 @@
 		(setq entry (list file)
 		      epa-file-passphrase-alist (cons entry
 						 epa-file-passphrase-alist)))
-	      (setq passphrase (epg-passphrase-callback-function nil))
+	      (setq passphrase (epg-passphrase-callback-function context
+								 key-id nil))
 	      (setcdr entry (copy-sequence passphrase))
 	      passphrase)))
-    (epg-passphrase-callback-function nil)))
+    (epg-passphrase-callback-function context key-id nil)))
 
 (defun epa-file-handler (operation &rest args)
   (save-match-data
@@ -72,8 +73,8 @@
 (defvar last-coding-system-used)
 (defun epa-file-insert-file-contents (file &optional visit beg end replace)
   (barf-if-buffer-read-only)
-  (if (or beg end)
-      (error "Can't read the file partially."))
+  (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))
@@ -89,21 +90,25 @@
 	  (if replace
 	      (goto-char (point-min)))
 	  (condition-case error
-	      (setq string (decode-coding-string
-			    (epg-decrypt-file context file nil)
-			    'undecided))
+	      (setq string (epg-decrypt-file context file nil))
 	    (error
 	     (if (setq entry (assoc file epa-file-passphrase-alist))
 		 (setcdr entry nil))
 	     (signal 'file-error
 		     (cons "Opening input file" (cdr error)))))
+	  (if (or beg end)
+	      (setq string (substring string (or beg 0) end)))
+	  (setq string
+		(decode-coding-string string
+				      (or coding-system-for-read '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))
-	  (insert string)
-	  (setq length (length string))
-	  (if replace
-	      (delete-region (point) (point-max))))
+	  (save-excursion
+	    (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)))
@@ -115,11 +120,12 @@
   (if append
       (error "Can't append to the file."))
   (setq file (expand-file-name 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))
+  (let* ((coding-system (or coding-system-for-write
+			    (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)
 	 string entry)
@@ -135,12 +141,11 @@
 		   (encode-coding-string start coding-system)
 		 (encode-coding-string (buffer-substring start end)
 				       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.  ")))))
+	       (unless (assoc file epa-file-passphrase-alist)
+		 (epa-select-keys
+		  context
+		  "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))