From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 2HMNC0/DbmONQAAAbAwnHQ (envelope-from ) for ; Fri, 11 Nov 2022 22:49:03 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id IKMYC0/DbmM8EgEAauVa8A (envelope-from ) for ; Fri, 11 Nov 2022 22:49:03 +0100 Received: from mail.notmuchmail.org (yantan.tethera.net [IPv6:2a01:4f9:c011:7a79::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 7F5D22FFAB for ; Fri, 11 Nov 2022 22:49:02 +0100 (CET) Received: from yantan.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id A60FC5FA7D; Fri, 11 Nov 2022 21:48:59 +0000 (UTC) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id C61CD5FA58 for ; Fri, 11 Nov 2022 21:48:56 +0000 (UTC) Received: by fethera.tethera.net (Postfix, from userid 1001) id 431575FBC2; Fri, 11 Nov 2022 16:48:56 -0500 (EST) Received: (nullmailer pid 46740 invoked by uid 1000); Fri, 11 Nov 2022 21:48:37 -0000 From: David Bremner To: Tomi Ollila , David Bremner , notmuch@notmuchmail.org Subject: [PATCH 2/3] emacs/show: add optional orig-tags argument to n-s-i-headerline Date: Fri, 11 Nov 2022 16:48:30 -0500 Message-Id: <20221111214831.46716-2-david@tethera.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221111214831.46716-1-david@tethera.net> References: <20221111214831.46716-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: 6LBJDQKZS463EXQPLICUEROPSPJIVMFD X-Message-ID-Hash: 6LBJDQKZS463EXQPLICUEROPSPJIVMFD X-MailFrom: bremner@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.3 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN X-Migadu-Country: DE ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1668203342; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-owner:list-unsubscribe:list-subscribe:list-post; bh=z+b957duG6+gC9nPuf2bSD6BcxzpET6/+rwbPUpFAR8=; b=fAQ86SYR9oWMOFb1MbuSuGz/HUWnAi8CnD3VLtlSYQXWcftozYXZWKV78eXzpwOGDI294q AnK3n3Qj4YtJ/nDI4wA0CE3Wv+MXAO6/8SZwUS7z1m3NzKGTKhxiuyWqkEjgYTPr/eJJeA YkAbZrHjQ1E7+Gfmjt/vKDCtkPApvG8U4oT3l8wE1a5aOh1SdfKIktcj7dw2XloYGvjjoR NALg8pXSdSi56uEFtM7P7zbYOFOrDRCbvCamn7wBu+PJJ9ZXDI98Bk8YPWgm5SRdyOoXih wy74j+gZrZ2iEjxEmKl0LPLgOAvqNTEK5Q5/VJ5i7EhhSKkVz0W5SM+fH7GYVQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1668203342; a=rsa-sha256; cv=none; b=b+/n6jL3kp4CQZpbRHVglbJnXJvG+2SA+weyTNwOt4N/cxKKPRyXbQnu3Nb1UTCgOH+Shl 2WFWGtdpUVr+13Drfgy62h4UGqQxYHAWnVVlDOyg8LyzOpG0qfTOWUGC+DJufquMkmDVJV oMwhnmDiDiYk+JPfXdxORMt3RsLpEGvrmDl2+J8lggKYFWewMoL1D3ohyruqPdwqiX7qQI dcNxKRR0+HB13Z1h9unoAZFDx62lZeaksdrOFvcIojnGUiuHe/wKG4whVOrVNhe7ToOqAc DdgfB6gXRXIO9oA+ulPB+pVX4Xu7X/toFPkwZvDNY3oGkFpwgHMYD7+2yH0ImA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2a01:4f9:c011:7a79::1 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -1.89 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2a01:4f9:c011:7a79::1 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 7F5D22FFAB X-Spam-Score: -1.89 X-Migadu-Scanner: scn0.migadu.com X-TUID: 0RHaB0Cx6Ply This will support use of this function in notmuch-show-update-tags. --- emacs/notmuch-show.el | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index b7a8de6a..5fb5ab31 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -530,7 +530,7 @@ Return unchanged ADDRESS if parsing fails." (plist-put msg :height height) height)))) -(defun notmuch-show-insert-headerline (msg-plist depth tags) +(defun notmuch-show-insert-headerline (msg-plist depth tags &optional orig-tags) "Insert a notmuch style headerline based on HEADERS for a message at DEPTH in the current thread." (let* ((start (point)) @@ -556,7 +556,7 @@ message at DEPTH in the current thread." " (" date ") (" - (notmuch-tag-format-tags tags tags) + (notmuch-tag-format-tags tags (or orig-tags tags)) ")") (insert (if (> file-count 1) -- 2.35.1