]> granicus.if.org Git - mutt/commitdiff
Respect ignore for the protected subject display.
authorKevin McCarthy <kevin@8t8.us>
Sat, 29 Dec 2018 21:50:00 +0000 (13:50 -0800)
committerKevin McCarthy <kevin@8t8.us>
Sat, 29 Dec 2018 22:12:07 +0000 (14:12 -0800)
crypt.c

diff --git a/crypt.c b/crypt.c
index 7c39f856a8df2d4d5786615093da4904d28e4237..0c3da3240998fb5394ffbb445f4ca713f62f8ab3 100644 (file)
--- a/crypt.c
+++ b/crypt.c
@@ -943,6 +943,11 @@ int mutt_protected_headers_handler (BODY *a, STATE *s)
   {
     if (a->mime_headers->subject)
     {
+      if ((s->flags & MUTT_DISPLAY) && option (OPTWEED) &&
+          mutt_matches_ignore ("subject", Ignore) &&
+          !mutt_matches_ignore ("subject", UnIgnore))
+        return 0;
+
       state_mark_protected_header (s);
       mutt_write_one_header (s->fpout, "Subject", a->mime_headers->subject,
                              s->prefix,