From: ueno <ueno>
Date: Fri, 26 May 2006 10:13:47 +0000 (+0000)
Subject: * epa.el (epa-insert-keys): Renamed from epa-list-keys-1; don't
X-Git-Tag: epg-0_0_2~18
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=74b46a0ecaa2cf2e877ae29ea9f4196f812688fd;p=elisp%2Fepg.git

* epa.el (epa-insert-keys): Renamed from epa-list-keys-1; don't
disable inhibit-quit here.
---

diff --git a/ChangeLog b/ChangeLog
index fd7d02e..748dd99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-05-26  Daiki Ueno  <ueno@unixuser.org>
 
+	* epa.el (epa-insert-keys): Renamed from epa-list-keys-1; don't
+	disable inhibit-quit here.
+
 	* epg.el (epg-make-context): New slot "operation".
 	(epg-passphrase-callback-function): Confirm passphrase when
 	performing symmetric encryption.
diff --git a/epa.el b/epa.el
index 300098e..75cb754 100644
--- a/epa.el
+++ b/epa.el
@@ -284,28 +284,27 @@
 		     (or (next-single-property-change point 'epa-list-keys)
 			 (point-max)))
       (goto-char point))
-    (epa-list-keys-1 context name mode)
+    (epa-insert-keys context name mode)
     (epa-keys-mode))
   (make-local-variable 'epa-list-keys-arguments)
   (setq epa-list-keys-arguments (list name mode protocol))
   (goto-char (point-min))
   (pop-to-buffer (current-buffer)))
 
-(defun epa-list-keys-1 (context name mode)
-  (save-restriction
-    (narrow-to-region (point) (point))
-    (let ((inhibit-read-only t)
-	  buffer-read-only
-	  (keys (epg-list-keys context 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-insert-keys (context name mode)
+  (save-excursion
+    (save-restriction
+      (narrow-to-region (point) (point))
+      (let ((keys (epg-list-keys context 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
@@ -357,12 +356,12 @@ If SECRET is non-nil, list secret keys instead of public keys."
       (if names
 	  (while names
 	    (setq point (point))
-	    (epa-list-keys-1 context (car names) secret)
+	    (epa-insert-keys context (car names) secret)
 	    (goto-char point)
 	    (epa-mark)
 	    (goto-char (point-max))
 	    (setq names (cdr names)))
-	(epa-list-keys-1 context nil secret))
+	(epa-insert-keys context nil secret))
       (epa-keys-mode)
       (setq epa-exit-buffer-function #'abort-recursive-edit)
       (goto-char (point-min))