[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#42397: [PATCH 02/14] ; * lisp/epg.el (epg-signature-to-string): Tiny
From: |
Jonas Bernoulli |
Subject: |
bug#42397: [PATCH 02/14] ; * lisp/epg.el (epg-signature-to-string): Tiny refactor. |
Date: |
Thu, 16 Jul 2020 16:54:44 +0200 |
`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).
---
lisp/epg.el | 32 ++++++++++++++------------------
1 file changed, 14 insertions(+), 18 deletions(-)
diff --git a/lisp/epg.el b/lisp/epg.el
index e97db65b60..c10eb4f06c 100644
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -412,24 +412,20 @@ epg-signature-to-string
(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."
--
2.26.0
- bug#42397: [PATCH 00/14] Use outline headings and some cosmetics, Jonas Bernoulli, 2020/07/16
- bug#42397: [PATCH 01/14] ; * lisp/epg.el (epg-signature-to-string): Use cl-case., Jonas Bernoulli, 2020/07/16
- bug#42397: [PATCH 02/14] ; * lisp/epg.el (epg-signature-to-string): Tiny refactor.,
Jonas Bernoulli <=
- bug#42397: [PATCH 03/14] ; * lisp/epg.el (epg-no-data-reason-alist): Fix typo in message., Jonas Bernoulli, 2020/07/16
- bug#42397: [PATCH 04/14] * lisp/epa.el (epa--derived-mode-p): Remove unnecessary alias., Jonas Bernoulli, 2020/07/16
- bug#42397: [PATCH 05/14] Split EasyPG libraries into outline sections, Jonas Bernoulli, 2020/07/16
- bug#42397: [PATCH 06/14] * lisp/emacs-lisp/eldoc.el (eldoc-minibuffer-message): Fix indentation., Jonas Bernoulli, 2020/07/16
- bug#42397: [PATCH 07/14] * lisp/progmodes/compile.el: Remove unnecessary comments., Jonas Bernoulli, 2020/07/16
- bug#42397: [PATCH 08/14] ; * lisp/whitespace.el: Capitalize "Code" section heading., Jonas Bernoulli, 2020/07/16
- bug#42397: [PATCH 09/14] * lisp/mail/smtpmail.el: Use outline headings., Jonas Bernoulli, 2020/07/16
- bug#42397: [PATCH 10/14] * test/src/emacs-module-tests.el: Use proper outline headings., Jonas Bernoulli, 2020/07/16
- bug#42397: [PATCH 11/14] * lisp/obsolete/longlines.el: Use proper outline headings., Jonas Bernoulli, 2020/07/16
- bug#42397: [PATCH 12/14] * lisp/net/imap.el: Use proper outline headings, Jonas Bernoulli, 2020/07/16