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.

diff --git a/notmuch-show.c b/notmuch-show.c
index 136f44391255c1b6a9123de0a394df393f38443e..6a54d9c16a0684b28bbc9e98e2c62bed340ba03e 100644 (file)
--- 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 831df1cc10fc9b5fceaca5182ea7fdc72649935c..a05b828ae9f759f31c12a41c015cc77224d8a4ea 100755 (executable)
--- 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