unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Jonas Bernoulli <jonas@bernoul.li>
To: 42397@debbugs.gnu.org
Cc: jonas@bernoul.li
Subject: bug#42397: [PATCH 02/14] ; * lisp/epg.el (epg-signature-to-string): Tiny refactor.
Date: Thu, 16 Jul 2020 16:54:44 +0200	[thread overview]
Message-ID: <20200716145456.17531-2-jonas@bernoul.li> (raw)
In-Reply-To: <20200716145456.17531-1-jonas@bernoul.li>

`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






  reply	other threads:[~2020-07-16 14:54 UTC|newest]

Thread overview: 59+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-16 14:47 bug#42397: [PATCH 00/14] Use outline headings and some cosmetics Jonas Bernoulli
2020-07-16 14:54 ` bug#42397: [PATCH 01/14] ; * lisp/epg.el (epg-signature-to-string): Use cl-case Jonas Bernoulli
2020-07-16 14:54   ` Jonas Bernoulli [this message]
2020-07-16 14:54     ` bug#42397: [PATCH 03/14] ; * lisp/epg.el (epg-no-data-reason-alist): Fix typo in message Jonas Bernoulli
2020-07-16 14:54       ` bug#42397: [PATCH 04/14] * lisp/epa.el (epa--derived-mode-p): Remove unnecessary alias Jonas Bernoulli
2020-07-16 14:54         ` bug#42397: [PATCH 05/14] Split EasyPG libraries into outline sections Jonas Bernoulli
2020-07-16 14:54           ` bug#42397: [PATCH 06/14] * lisp/emacs-lisp/eldoc.el (eldoc-minibuffer-message): Fix indentation Jonas Bernoulli
2020-07-16 14:54             ` bug#42397: [PATCH 07/14] * lisp/progmodes/compile.el: Remove unnecessary comments Jonas Bernoulli
2020-07-16 14:54               ` bug#42397: [PATCH 08/14] ; * lisp/whitespace.el: Capitalize "Code" section heading Jonas Bernoulli
2020-07-16 14:54                 ` bug#42397: [PATCH 09/14] * lisp/mail/smtpmail.el: Use outline headings Jonas Bernoulli
2020-07-16 14:54                   ` bug#42397: [PATCH 10/14] * test/src/emacs-module-tests.el: Use proper " Jonas Bernoulli
2020-07-16 14:54                     ` bug#42397: [PATCH 11/14] * lisp/obsolete/longlines.el: " Jonas Bernoulli
2020-07-16 14:54                       ` bug#42397: [PATCH 12/14] * lisp/net/imap.el: " Jonas Bernoulli
2020-07-16 14:54                         ` bug#42397: [PATCH 13/14] * lisp/font-lock.el: Split the Commentary into subsections Jonas Bernoulli
2020-07-16 14:54                           ` bug#42397: [PATCH 14/14] * lisp/font-lock.el: No longer mark each end of a section explicitly Jonas Bernoulli
2020-07-16 15:24                             ` Eli Zaretskii
2020-07-16 15:27             ` bug#42397: [PATCH 06/14] * lisp/emacs-lisp/eldoc.el (eldoc-minibuffer-message): Fix indentation Eli Zaretskii
2020-07-16 16:56               ` Jonas Bernoulli
2020-07-16 17:17                 ` Robert Pluim
2020-07-16 17:54                   ` Jonas Bernoulli
2020-07-16 18:23                     ` Noam Postavsky
2020-07-16 18:40                       ` Jonas Bernoulli
2020-07-16 19:25                 ` Eli Zaretskii
2020-07-16 21:52                   ` Jonas Bernoulli
2020-07-17  3:40                     ` Eli Zaretskii
2020-07-17 18:19                       ` Jonas Bernoulli
2020-07-17 10:49             ` Basil L. Contovounesios
2020-07-17 18:23               ` Jonas Bernoulli
2020-07-16 15:21       ` bug#42397: [PATCH 03/14] ; * lisp/epg.el (epg-no-data-reason-alist): Fix typo in message Eli Zaretskii
2020-07-16 16:57         ` Jonas Bernoulli
2020-07-16 17:24     ` bug#42397: [PATCH 02/14] ; * lisp/epg.el (epg-signature-to-string): Tiny refactor Robert Pluim
2020-07-16 18:03       ` Jonas Bernoulli
2020-07-16 17:22   ` bug#42397: [PATCH 01/14] ; * lisp/epg.el (epg-signature-to-string): Use cl-case Robert Pluim
2020-07-16 17:57     ` Jonas Bernoulli
2020-07-16 15:09 ` bug#42397: This message is a test Jonas Bernoulli
2020-07-16 15:12 ` bug#42397: [PATCH 00/14] Use outline headings and some cosmetics Drew Adams
2020-07-16 15:30   ` Eli Zaretskii
2020-07-16 18:34     ` Jonas Bernoulli
2020-07-17  6:29       ` Eli Zaretskii
2020-08-10 21:14 ` bug#42397: [PATCH v2 00/16] " Jonas Bernoulli
2020-08-10 21:14   ` bug#42397: [PATCH v2 01/16] ; * lisp/epg.el (epg-signature-to-string): Use cl-case Jonas Bernoulli
2020-08-10 21:14   ` bug#42397: [PATCH v2 02/16] ; * lisp/epg.el (epg-signature-to-string): Tiny refactor Jonas Bernoulli
2020-08-10 21:14   ` bug#42397: [PATCH v2 03/16] ; * lisp/epg.el (epg-no-data-reason-alist): Fix typo in message Jonas Bernoulli
2020-08-10 21:14   ` bug#42397: [PATCH v2 04/16] * lisp/epa.el (epa--derived-mode-p): Remove unnecessary alias Jonas Bernoulli
2020-08-10 21:14   ` bug#42397: [PATCH v2 05/16] Split EasyPG libraries into outline sections Jonas Bernoulli
2020-08-10 21:14   ` bug#42397: [PATCH v2 06/16] Merge two conditions and fix indentation Jonas Bernoulli
2020-08-10 21:14   ` bug#42397: [PATCH v2 07/16] * lisp/progmodes/compile.el: Remove unnecessary comments Jonas Bernoulli
2020-08-10 21:14   ` bug#42397: [PATCH v2 08/16] ; * lisp/whitespace.el: Capitalize "Code" section heading Jonas Bernoulli
2020-08-10 21:14   ` bug#42397: [PATCH v2 09/16] * lisp/mail/smtpmail.el: Use outline headings Jonas Bernoulli
2020-08-10 21:14   ` bug#42397: [PATCH v2 10/16] * test/src/emacs-module-tests.el: Use proper " Jonas Bernoulli
2020-08-10 21:14   ` bug#42397: [PATCH v2 11/16] * lisp/obsolete/longlines.el: " Jonas Bernoulli
2020-08-10 21:14   ` bug#42397: [PATCH v2 12/16] * lisp/net/imap.el: " Jonas Bernoulli
2020-08-10 21:14   ` bug#42397: [PATCH v2 13/16] * lisp/font-lock.el: Split the Commentary into subsections Jonas Bernoulli
2020-08-10 21:14   ` bug#42397: [PATCH v2 14/16] * lisp/font-lock.el: No longer use headings as end of section markers Jonas Bernoulli
2020-08-10 21:14   ` bug#42397: [PATCH v2 15/16] ; * lisp/emacs-lisp/autoload.el: Begin summary line with three semicolons Jonas Bernoulli
2020-08-10 21:14   ` bug#42397: [PATCH v2 16/16] Update section heading conventions for libraries Jonas Bernoulli
2020-08-12 16:54     ` Eli Zaretskii
2020-08-16 18:43 ` bug#42397: [PATCH 00/14] Use outline headings and some cosmetics Jonas Bernoulli
2020-08-16 19:29   ` Stefan Kangas

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200716145456.17531-2-jonas@bernoul.li \
    --to=jonas@bernoul.li \
    --cc=42397@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).