procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

; * lisp/epg.el (epg-signature-to-string): Tiny refactor.

Browse source 
`concat' treats arguments that are nil as if they were empty strings.
We therefore do not have to write (if TEST THEN "") and can just use
(and TEST THEN).
This commit is contained in:
Jonas Bernoulli 2020-07-15 19:07:03 +02:00
parent 944608851c
commit 7ba75919ab
1 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
lisp/epg.el
View file

@ -412,24 +412,20 @@ callback data (if any)."
(revoked-key "Signature made by revoked key ")
(no-pubkey "No public key for "))
key-id
(if user-id
(concat " "
(if (stringp user-id)
(epg--decode-percent-escape-as-utf-8 user-id)
(epg-decode-dn user-id)))
"")
(if (epg-signature-validity signature)
(format " (trust %s)" (epg-signature-validity signature))
"")
(if (epg-signature-creation-time signature)
(format-time-string " created at %Y-%m-%dT%T%z"
(epg-signature-creation-time signature))
"")
(if pubkey-algorithm
(concat " using "
(or (cdr (assq pubkey-algorithm epg-pubkey-algorithm-alist))
(format "(unknown algorithm %d)" pubkey-algorithm)))
""))))
(and user-id
(concat " "
(if (stringp user-id)
(epg--decode-percent-escape-as-utf-8 user-id)
(epg-decode-dn user-id))))
(and (epg-signature-validity signature)
(format " (trust %s)" (epg-signature-validity signature)))
(and (epg-signature-creation-time signature)
(format-time-string " created at %Y-%m-%dT%T%z"
(epg-signature-creation-time signature)))
(and pubkey-algorithm
(concat " using "
(or (cdr (assq pubkey-algorithm epg-pubkey-algorithm-alist))
(format "(unknown algorithm %d)" pubkey-algorithm)))))))
(defun epg-verify-result-to-string (verify-result)
"Convert VERIFY-RESULT to a human readable string."