When composing a reply, no one wants to see this line in the proposed
message:
Non-text part: application/pkcs7-mime
So we hide it, the same way we hide PGP/MIME cruft.
Signed-off-by: Daniel Kahn Gillmor <[email protected]>
---
notmuch-reply.c | 5 +++--
test/T355-smime.sh | 1 -
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/notmuch-reply.c b/notmuch-reply.c
index 2c30f6f9..ceb4f39b 100644
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -65,8 +65,9 @@ format_part_reply (GMimeStream *stream, mime_node_t *node)
GMimeContentDisposition *disposition =
g_mime_object_get_content_disposition (node->part);
if (g_mime_content_type_is_type (content_type, "application",
"pgp-encrypted") ||
- g_mime_content_type_is_type (content_type, "application",
"pgp-signature")) {
- /* Ignore PGP/MIME cruft parts */
+ g_mime_content_type_is_type (content_type, "application",
"pgp-signature") ||
+ g_mime_content_type_is_type (content_type, "application",
"pkcs7-mime")) {
+ /* Ignore PGP/MIME and S/MIME cruft parts */
} else if (g_mime_content_type_is_type (content_type, "text", "*") &&
! g_mime_content_type_is_type (content_type, "text",
"html")) {
show_text_part_content (node->part, stream,
NOTMUCH_SHOW_TEXT_PART_REPLY);
diff --git a/test/T355-smime.sh b/test/T355-smime.sh
index 399bd91c..ddc91a56 100755
--- a/test/T355-smime.sh
+++ b/test/T355-smime.sh
@@ -134,7 +134,6 @@ OpenPGP Example Corp"
test_expect_equal "$expected" "$output"
test_begin_subtest "reply to PKCS#7 SignedData message with proper quoting and
attribution"
-test_subtest_known_broken
output=$(notmuch reply id:[email protected])
expected="From: Notmuch Test Suite <[email protected]>
Subject: Re: The FooCorp contract
--
2.24.0
_______________________________________________
notmuch mailing list
[email protected]
https://notmuchmail.org/mailman/listinfo/notmuch
