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 ms0.migadu.com with LMTPS id aEmtHpqrNWJiTQAAgWs5BA (envelope-from ) for ; Sat, 19 Mar 2022 11:08:26 +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 QFtOG5qrNWIUSwAAauVa8A (envelope-from ) for ; Sat, 19 Mar 2022 11:08:26 +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 13DC43CC6A for ; Sat, 19 Mar 2022 11:08:26 +0100 (CET) Received: from yantan.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 10C2B5F730; Sat, 19 Mar 2022 10:08:17 +0000 (UTC) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id D8C495F702 for ; Sat, 19 Mar 2022 10:08:13 +0000 (UTC) Received: by fethera.tethera.net (Postfix, from userid 1001) id 3A5B85FC01; Sat, 19 Mar 2022 06:08:13 -0400 (EDT) Received: (nullmailer pid 1670566 invoked by uid 1000); Sat, 19 Mar 2022 10:08:11 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: [PATCH 5/5] emacs/reply: restrict what mime types are inlined by default Date: Sat, 19 Mar 2022 07:07:54 -0300 Message-Id: <20220319100754.1670462-6-david@tethera.net> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220319100754.1670462-1-david@tethera.net> References: <20220319100754.1670462-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: 2JJ46WXDPUIVGWGSHL3TTPWJACGWQ3FG X-Message-ID-Hash: 2JJ46WXDPUIVGWGSHL3TTPWJACGWQ3FG 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-To: larch@yhetil.org X-Migadu-Country: DE ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1647684506; 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=bs5MHfs5vKdoOatAdmBkBwUwQs4cv3wqkRI/vp8sbBM=; b=pHVdviCv82D+hzas7KCBsTRhuZaLIq07YSoOaxhEbxmM4chrZ1dmagmBC2CdtUyDNUhxft 16hk1NHGnCb2yRNldvTtT9jMcadFpwN8i9k4KqqMdo3fZCp8ckXNq2b93Wexl3XsN9D2Ix V3OYXOqyiquWyB1WWLZ7OthDVBbcBY8C3SphKjq0JfdnqZpCagDFRbdGlkytC1KcMC+4UG 35h8MmMqfk3LD6uzraRP0t8jwX5Dh5tjTDjpS6R3Z0KG+vKuLVP6gpdivdzWn+4vLohSaJ svu57wAYda3XFRWKef1FLrKrIkBGLbioBQaxvgGcg2MfIcF2MVhVx1Ngc6q/FQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1647684506; a=rsa-sha256; cv=none; b=V7oQtMoulvboFPEbrcXqVepcubEinkGyvJHpkDhULcePp//wUz2sSU32OziRDHxyHZ3G70 +EmLvqaOayzGIHgbaXMEGOukVpRPluglw+NslyIG+S/oPm7vIWZG9Yhpc7L2NyE54mP7Fc +h4xX0fgU/fzLEBU48XUYWuEZIdz7M46DPy+/LnOzetbTUo2Q/YweQr3PhSAijkuXyxCEA Hxdh1/PC2uuffOt/jGGn3Pgp7vE9pskn1gQgNHDdWSFZmKMXGpg9FbMWkwn0JjZZF7+bJk ClgiRhf/VL2sWPOTrDW2xVE9x6IA6oDgsEk4q/BUNx5duQ/TOZNnzamLnLf4/w== 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.98 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: 13DC43CC6A X-Spam-Score: -1.98 X-Migadu-Scanner: scn0.migadu.com X-TUID: hu6uXn2jWx1S Apply the previously factored-out function used by notmuch-show. --- emacs/notmuch-mua.el | 4 +++- test/T453-emacs-reply.sh | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el index c679373b..60801f4b 100644 --- a/emacs/notmuch-mua.el +++ b/emacs/notmuch-mua.el @@ -316,7 +316,9 @@ Typically this is added to `notmuch-mua-send-hook'." ;; text. (notmuch-show-process-crypto process-crypto) ;; Don't indent multipart sub-parts. - (notmuch-show-indent-multipart nil)) + (notmuch-show-indent-multipart nil) + ;; Stop certain mime types from being inlined + (mm-inline-override-types (notmuch--inline-override-types))) ;; We don't want sigstatus buttons (an information leak and usually wrong anyway). (cl-letf (((symbol-function 'notmuch-crypto-insert-sigstatus-button) #'ignore) ((symbol-function 'notmuch-crypto-insert-encstatus-button) #'ignore)) diff --git a/test/T453-emacs-reply.sh b/test/T453-emacs-reply.sh index 5d6c5309..c26c4473 100755 --- a/test/T453-emacs-reply.sh +++ b/test/T453-emacs-reply.sh @@ -11,7 +11,6 @@ test_require_emacs add_email_corpus attachment test_begin_subtest "tar not inlined by default" -test_subtest_known_broken test_emacs '(notmuch-mua-new-reply "id:874llc2bkp.fsf@curie.anarc.at") (test-visible-output "OUTPUT.raw")' cat < EXPECTED -- 2.35.1