better UI for epa-insert-keys

better UI for epa-insert-keys

[Richard Stallman]

[I have had no response to posting this a week ago]

I've written a patch to make epa-list-keys insert text to explain
the cryptic letters that come first in each line.

This function epa--insert-keys is called from other places
and I don't entirely understand how they are supposed to interact.
I added comments explaining what I think that does
but I am not sure of them.

Would someone please verify this code and the comments?


diff --git a/lisp/epa.el b/lisp/epa.el
index a2be9a3..5ec33b7 100644
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -360,7 +360,10 @@ epa--insert-keys
 				 'start-open t
 				 'end-open t)))))
 
-(defun epa--list-keys (name secret)
+(defun epa--list-keys (name secret &optional doc)
+  "NAME specifies which key to list.
+SECRET says list data on the secret key (default, the public key).
+DOC is documentation text to insert at the start."
   (unless (and epa-keys-buffer
 	       (buffer-live-p epa-keys-buffer))
     (setq epa-keys-buffer (generate-new-buffer "*Keys*")))
@@ -370,13 +373,28 @@ epa--list-keys
 	buffer-read-only
 	(point (point-min))
 	(context (epg-make-context epa-protocol)))
+
+    ;; Find the end of the documentation text at the start.
+    ;; Set POINT to where it ends, or nil if ends at eob.
     (unless (get-text-property point 'epa-list-keys)
       (setq point (next-single-property-change point 'epa-list-keys)))
+    
+    ;; If caller specified documentation text for that, replace the old
+    ;; documentation text (if any) with what was specified.
+    ;; Otherwise, preserve whatever intro text is present.
+    (when doc
+      (if (or point (not (eobp)))
+          (delete-region (point-min) point))
+      (insert doc)
+      (setq point (point)))
+
+    ;; Now delete the key description text, if any.
     (when point
       (delete-region point
 		     (or (next-single-property-change point 'epa-list-keys)
 			 (point-max)))
       (goto-char point))
+
     (epa--insert-keys (epg-list-keys context name secret))
     (widget-setup)
     (set-keymap-parent (current-local-map) widget-keymap))
@@ -395,7 +413,13 @@ epa-list-keys
 				    (car epa-list-keys-arguments)))))
 	 (list (if (equal name "") nil name)))
      (list nil)))
-  (epa--list-keys name nil))
+  (epa--list-keys name nil
+                  "The letters at the start of a line have these meanings.
+e  expired key.  n  never trust.  m  trust marginally.  u  trust ultimately.
+f  trust fully (keys you have signed, usually).
+q  trust status questionable.  -  trust status unspecified.
+ See GPG documentaion for more explanation.
+\n"))
 
 ;;;###autoload
 (defun epa-list-secret-keys (&optional name)


-- 
Dr Richard Stallman
Founder, Free Software Foundation (https://gnu.org, https://fsf.org)
Internet Hall-of-Famer (https://internethalloffame.org)

Re: better UI for epa-insert-keys

[Lars Ingebrigtsen]

Richard Stallman <rms@gnu.org> writes:

> Would someone please verify this code and the comments?

Looks OK to me (although I haven't tested).  Applied to the trunk.

-- 
(domestic pets only, the antidote for overdose, milk.)
   bloggy blog: http://lars.ingebrigtsen.no

Re: better UI for epa-insert-keys

[Richard Stallman]

[[[ To any NSA and FBI agents reading my email: please consider    ]]]
[[[ whether defending the US Constitution against all enemies,     ]]]
[[[ foreign or domestic, requires you to follow Snowden's example. ]]]

  > Looks OK to me (although I haven't tested).  Applied to the trunk.

Thanks.

-- 
Dr Richard Stallman
Founder, Free Software Foundation (https://gnu.org, https://fsf.org)
Internet Hall-of-Famer (https://internethalloffame.org)