X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=epa.el;h=cb0cb3bcf7478ef7d4eecba3f2a7de6f5f3e4113;hb=9c4b50c1650d0f1c9d0c6189d721de83d57d8ce6;hp=4269254e1c179f8bf1d3b0430a8c85fb8dc3e492;hpb=25c10a3b29fce03e64fcae3e2c470305f1202987;p=elisp%2Fepg.git

diff --git a/epa.el b/epa.el
index 4269254..cb0cb3b 100644
--- a/epa.el
+++ b/epa.el
@@ -362,8 +362,7 @@ If SECRET is non-nil, list secret keys instead of public keys."
 		 (buffer-live-p epa-keys-buffer))
       (setq epa-keys-buffer (generate-new-buffer "*Keys*")))
     (let ((inhibit-read-only t)
-	  buffer-read-only
-	  point)
+	  buffer-read-only)
       (set-buffer epa-keys-buffer)
       (erase-buffer)
       (insert prompt "\n")
@@ -382,24 +381,28 @@ If SECRET is non-nil, list secret keys instead of public keys."
       (insert "\n\n")
       (if names
 	  (while names
-	    (setq point (point))
 	    (epa-insert-keys context (car names) secret)
-	    (goto-char point)
-	    (epa-mark)
+	    (if (get-text-property (point) 'epa-list-keys)
+		(epa-mark))
 	    (goto-char (point-max))
 	    (setq names (cdr names)))
-	(epa-insert-keys context nil secret))
+	(if secret
+	    (progn
+	      (epa-insert-keys context nil secret)
+	      (if (get-text-property (point) 'epa-list-keys)
+		  (epa-mark)))
+	  (epa-insert-keys context nil nil)))
       (epa-keys-mode)
       (setq epa-exit-buffer-function #'abort-recursive-edit)
       (goto-char (point-min))
       (pop-to-buffer (current-buffer)))
     (unwind-protect
-	  (progn
-	    (recursive-edit)
-	    (epa-marked-keys))
-	(if (get-buffer-window epa-keys-buffer)
-	    (delete-window (get-buffer-window epa-keys-buffer)))
-	(kill-buffer epa-keys-buffer))))
+	(progn
+	  (recursive-edit)
+	  (epa-marked-keys))
+      (if (get-buffer-window epa-keys-buffer)
+	  (delete-window (get-buffer-window epa-keys-buffer)))
+      (kill-buffer epa-keys-buffer))))
 
 (defun epa-show-key (key)
   (let* ((primary-sub-key (car (epg-key-sub-key-list key)))
@@ -450,10 +453,13 @@ If SECRET is non-nil, list secret keys instead of public keys."
 	      (cdr (assq (epg-sub-key-algorithm (car pointer))
 			 epg-pubkey-algorithm-alist))
 	      "\n\tCreated: "
-	      (epg-sub-key-creation-time (car pointer))
+	      (format-time-string "%Y-%m-%d"
+				  (epg-sub-key-creation-time (car pointer)))
 	      (if (epg-sub-key-expiration-time (car pointer))
-		  (format "\n\tExpires: %s" (epg-sub-key-expiration-time
-					     (car pointer)))
+		  (format "\n\tExpires: %s"
+			  (format-time-string "%Y-%m-%d"
+					      (epg-sub-key-expiration-time
+					       (car pointer))))
 		"")
 	      "\n\tCapabilities: "
 	      (mapconcat #'symbol-name
@@ -490,6 +496,11 @@ If ARG is non-nil, mark the current line."
   (interactive "P")
   (epa-mark (not arg)))
 
+(defun epa-toggle-mark ()
+  "Toggle the mark the current line."
+  (interactive)
+  (epa-mark (eq (char-after (save-excursion (beginning-of-line) (point))) ?*)))
+
 (defun epa-exit-buffer ()
   "Exit the current buffer.
 `epa-exit-buffer-function' is called if it is set."
@@ -589,7 +600,7 @@ If no one is selected, default secret key is used.  "
   "Encrypt FILE for RECIPIENTS."
   (interactive
    (list (expand-file-name (read-file-name "File: "))
-	 (epa-select-keys (epg-make-context) "Select recipents for encryption.
+	 (epa-select-keys (epg-make-context) "Select recipients for encryption.
 If no one is selected, symmetric encryption will be performed.  ")))
   (let ((cipher (concat file (if epa-armor ".asc" ".gpg")))
 	(context (epg-make-context)))
@@ -725,7 +736,7 @@ If no one is selected, default secret key is used.  "
 Don't use this command in Lisp programs!"
   (interactive
    (list (region-beginning) (region-end)
-	 (epa-select-keys (epg-make-context) "Select recipents for encryption.
+	 (epa-select-keys (epg-make-context) "Select recipients for encryption.
 If no one is selected, symmetric encryption will be performed.  ")))
   (save-excursion
     (let ((context (epg-make-context))