diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2020-08-26 13:22:55 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2020-08-26 13:23:00 +0200 |
| commit | a4d57add69fd2077bd21ce917ea8ca3b22621ec0 (patch) | |
| tree | e50c91690cee07327ba7b7bd7ad4802813be965b /lisp/epa.el | |
| parent | e48c60e7c9b4d6e5a11fc11cdd5dded868321b80 (diff) | |
| download | emacs-a4d57add69fd2077bd21ce917ea8ca3b22621ec0.tar.gz emacs-a4d57add69fd2077bd21ce917ea8ca3b22621ec0.tar.bz2 emacs-a4d57add69fd2077bd21ce917ea8ca3b22621ec0.zip | |
Make the epa key display slightly more informative
* lisp/epa.el (epa--button-key-text): Say what the validity
characters output by GPG mean (bug#34726).
Diffstat (limited to 'lisp/epa.el')
| -rw-r--r-- | lisp/epa.el | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/lisp/epa.el b/lisp/epa.el index 3c804361c36..b065887cef1 100644 --- a/lisp/epa.el +++ b/lisp/epa.el @@ -255,18 +255,25 @@ You should bind this variable with `let', but do not set it globally.") (validity (epg-sub-key-validity (car (epg-key-sub-key-list key))))) (propertize (concat - (format "%c " - (if (epg-sub-key-validity primary-sub-key) - (car (rassq (epg-sub-key-validity primary-sub-key) - epg-key-validity-alist)) - ? )) - (epg-sub-key-id primary-sub-key) - " " - (if primary-user-id - (if (stringp (epg-user-id-string primary-user-id)) - (epg-user-id-string primary-user-id) - (epg-decode-dn (epg-user-id-string primary-user-id))) - "")) + (propertize + (format "%c " + (if (epg-sub-key-validity primary-sub-key) + (car (rassq (epg-sub-key-validity primary-sub-key) + epg-key-validity-alist)) + ? )) + 'help-echo (format "Validity: %s" + (epg-sub-key-validity primary-sub-key))) + (propertize + (concat + (epg-sub-key-id primary-sub-key) + " " + (if primary-user-id + (if (stringp (epg-user-id-string primary-user-id)) + (epg-user-id-string primary-user-id) + (epg-decode-dn (epg-user-id-string primary-user-id))) + "")) + 'help-echo (format "Show %s" + (epg-sub-key-id (car (epg-key-sub-key-list key)))))) 'face (if validity (cdr (assq validity epa-validity-face-alist)) @@ -334,9 +341,7 @@ If ARG is non-nil, mark the key." (insert (propertize (concat " " (epa--button-key-text key)) - 'epa-key key - 'help-echo (format "Show %s" - (epg-sub-key-id (car (epg-key-sub-key-list key)))))) + 'epa-key key)) (insert "\n"))) (defun epa--list-keys (name secret &optional doc) |