X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=epa.el;h=043ffd6194b766fa5b5474332fb609c0fccf791e;hb=5944a44f16964313efa58244a1ad0e62f32237fb;hp=ecabd697e7c95b77e3b0a8b779e713929c41dd93;hpb=477dbb0deef57be2a0edc8c0d01f7756bc6aa727;p=elisp%2Fepg.git

diff --git a/epa.el b/epa.el
index ecabd69..043ffd6 100644
--- a/epa.el
+++ b/epa.el
@@ -254,8 +254,15 @@
     (setq epa-keys-buffer (generate-new-buffer "*Keys*")))
   (set-buffer epa-keys-buffer)
   (let ((inhibit-read-only t)
-	buffer-read-only)
-    (erase-buffer)
+	buffer-read-only
+	(point (point-min)))
+    (unless (get-text-property point 'epa-list-keys)
+      (setq point (next-single-property-change point 'epa-list-keys)))
+    (when point
+      (delete-region point
+		     (or (next-single-property-change point 'epa-list-keys)
+			 (point-max)))
+      (goto-char point))
     (epa-list-keys-1 name mode)
     (epa-keys-mode))
   (make-local-variable 'epa-list-keys-arguments)
@@ -264,17 +271,20 @@
   (pop-to-buffer (current-buffer)))
 
 (defun epa-list-keys-1 (name mode)
-  (let ((inhibit-read-only t)
-	buffer-read-only
-	(keys (epg-list-keys name mode))
-	point)
-    (while keys
-      (setq point (point))
-      (insert "  ")
-      (put-text-property point (point) 'epa-key (car keys))
-      (widget-create 'epa-key :value (car keys))
-      (insert "\n")
-      (setq keys (cdr keys)))))
+  (save-restriction
+    (narrow-to-region (point) (point))
+    (let ((inhibit-read-only t)
+	  buffer-read-only
+	  (keys (epg-list-keys name mode))
+	  point)
+      (while keys
+	(setq point (point))
+	(insert "  ")
+	(put-text-property point (point) 'epa-key (car keys))
+	(widget-create 'epa-key :value (car keys))
+	(insert "\n")
+	(setq keys (cdr keys))))      
+    (put-text-property (point-min) (point-max) 'epa-list-keys t)))
 
 (defun epa-marked-keys ()
   (or (save-excursion
@@ -443,9 +453,8 @@
     (epg-verify-file context file plain)
     (message "Verifying %s...done" (file-name-nondirectory file))
     (message "%s"
-	     (mapconcat #'epg-verify-result-to-string
-			(reverse (epg-context-result-for context 'verify))
-			"\n"))))
+	     (epg-verify-result-to-string
+	      (epg-context-result-for context 'verify)))))
 
 (defun epa-sign-file (file detached)
   (interactive
@@ -465,10 +474,7 @@ If no one is selected, symmetric encryption will be performed.  ")))
   (let ((cipher (concat file ".gpg"))
 	(context (epg-make-context)))
     (message "Encrypting %s..." (file-name-nondirectory file))
-    (epg-encrypt-file context
-		      file
-		      recipients
-		      cipher)
+    (epg-encrypt-file context file recipients cipher)
     (message "Encrypting %s...done" (file-name-nondirectory file))))
 
 (defun epa-delete-keys (keys)