aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Bremner <david@tethera.net>2022-01-18 21:26:45 -0400
committerDavid Bremner <david@tethera.net>2022-01-18 21:26:45 -0400
commit87d5a5a8aa323077c0b79fce42d062839eb2ff2d (patch)
tree15f2e953a17bc858c54684b6e8b9462dc2310130
parent2d036dbc3b6e48b12ab3e8aa0cbe713d2ef96854 (diff)
CLI: print extra headers only for non-replies
If in the future we decide to output extra headers for replies, this should be controlled by a separate configuration option.
-rw-r--r--notmuch-show.c3
-rwxr-xr-xtest/T310-emacs.sh1
2 files changed, 2 insertions, 2 deletions
diff --git a/notmuch-show.c b/notmuch-show.c
index 136f4439..6a54d9c1 100644
--- a/notmuch-show.c
+++ b/notmuch-show.c
@@ -294,7 +294,8 @@ format_headers_sprinter (sprinter_t *sp, GMimeMessage *message,
}
/* Output extra headers the user has configured, if any */
- format_extra_headers_sprinter (sp, message);
+ if (! reply)
+ format_extra_headers_sprinter (sp, message);
sp->end (sp);
talloc_free (local);
}
diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh
index 831df1cc..a05b828a 100755
--- a/test/T310-emacs.sh
+++ b/test/T310-emacs.sh
@@ -486,7 +486,6 @@ EOF
test_expect_equal_file EXPECTED OUTPUT
test_begin_subtest "Reply with show.extra_headers set"
-test_subtest_known_broken
notmuch config set show.extra_headers Received
add_message '[from]="Sender <sender@example.com>"' \
[to]=test_suite_other@notmuchmail.org