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 v2 02/16] ; * lisp/epg.el (epg-signature-to-string): Tiny refactor. Date: Mon, 10 Aug 2020 23:14:16 +0200 Message-ID: <20200810211430.22502-3-jonas@bernoul.li> References: <20200716144707.16857-1-jonas@bernoul.li> <20200810211430.22502-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="26468"; mail-complaints-to="usenet@ciao.gmane.io" To: 42397@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Aug 10 23:15:46 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 1k5F8z-0006jQ-Eo for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 10 Aug 2020 23:15:45 +0200 Original-Received: from localhost ([::1]:51516 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k5F8x-0002hd-Jn for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 10 Aug 2020 17:15:43 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:37236) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k5F8J-0002gS-Og for bug-gnu-emacs@gnu.org; Mon, 10 Aug 2020 17:15:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:54329) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k5F8J-0005lF-FP for bug-gnu-emacs@gnu.org; Mon, 10 Aug 2020 17:15:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k5F8J-0007U5-Aa for bug-gnu-emacs@gnu.org; Mon, 10 Aug 2020 17:15:03 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Jonas Bernoulli Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 10 Aug 2020 21:15:03 +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.159709408328660 (code B ref 42397); Mon, 10 Aug 2020 21:15:03 +0000 Original-Received: (at 42397) by debbugs.gnu.org; 10 Aug 2020 21:14:43 +0000 Original-Received: from localhost ([127.0.0.1]:37628 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k5F7y-0007SC-S5 for submit@debbugs.gnu.org; Mon, 10 Aug 2020 17:14:43 -0400 Original-Received: from mail.hostpark.net ([212.243.197.30]:56086) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k5F7x-0007S4-Bh for 42397@debbugs.gnu.org; Mon, 10 Aug 2020 17:14:41 -0400 Original-Received: from localhost (localhost [127.0.0.1]) by mail.hostpark.net (Postfix) with ESMTP id C029816B2A; Mon, 10 Aug 2020 23:14:40 +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 itAJbJMTpmPs; Mon, 10 Aug 2020 23:14:40 +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 9757015FD0; Mon, 10 Aug 2020 23:14:40 +0200 (CEST) X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200810211430.22502-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:184584 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 65decf3cf5..e53aa8caaa 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.28.0