From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Jonas Bernoulli Newsgroups: gmane.emacs.bugs Subject: bug#42397: [PATCH 02/14] ; * lisp/epg.el (epg-signature-to-string): Tiny refactor. Date: Thu, 16 Jul 2020 16:54:44 +0200 Message-ID: <20200716145456.17531-2-jonas@bernoul.li> References: <20200716145456.17531-1-jonas@bernoul.li> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="39290"; mail-complaints-to="usenet@ciao.gmane.io" Cc: jonas@bernoul.li To: 42397@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Jul 16 16:57:42 2020 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jw5KQ-000A80-Gd for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 16 Jul 2020 16:57:42 +0200 Original-Received: from localhost ([::1]:45772 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jw5KP-00076O-Cw for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 16 Jul 2020 10:57:41 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:51976) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jw5Ip-0006EG-5p for bug-gnu-emacs@gnu.org; Thu, 16 Jul 2020 10:56:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:44163) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jw5Io-0002QP-SZ for bug-gnu-emacs@gnu.org; Thu, 16 Jul 2020 10:56:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jw5Io-0007eB-Rn for bug-gnu-emacs@gnu.org; Thu, 16 Jul 2020 10:56:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Jonas Bernoulli Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 16 Jul 2020 14:56:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42397 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 42397-submit@debbugs.gnu.org id=B42397.159491130429175 (code B ref 42397); Thu, 16 Jul 2020 14:56:02 +0000 Original-Received: (at 42397) by debbugs.gnu.org; 16 Jul 2020 14:55:04 +0000 Original-Received: from localhost ([127.0.0.1]:55675 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jw5Hs-0007aV-JE for submit@debbugs.gnu.org; Thu, 16 Jul 2020 10:55:04 -0400 Original-Received: from mail.hostpark.net ([212.243.197.30]:59918) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jw5Hr-0007aK-BJ for 42397@debbugs.gnu.org; Thu, 16 Jul 2020 10:55:03 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by mail.hostpark.net (Postfix) with ESMTP id A30A6160BA; Thu, 16 Jul 2020 16:55:02 +0200 (CEST) X-Virus-Scanned: by Hostpark/NetZone Mailprotection at hostpark.net Original-Received: from mail.hostpark.net ([127.0.0.1]) by localhost (mail1.hostpark.net [127.0.0.1]) (amavisd-new, port 10124) with ESMTP id GlL3fWWNS180; Thu, 16 Jul 2020 16:55:02 +0200 (CEST) Original-Received: from customer (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.hostpark.net (Postfix) with ESMTPSA id 752A8160AE; Thu, 16 Jul 2020 16:55:02 +0200 (CEST) X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200716145456.17531-1-jonas@bernoul.li> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:183056 Archived-At: `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