notmuch: make 'Folder' and 'Tags' respect (un)ignore

To get the previous behaviour, add this to your muttrc:

    unignore folder tags

Closes: #279

diff --git a/copy.c b/copy.c
index f4c1945d34462e9cca06708a327288b13a825377..e226216bd00518bece18484ec3d74f4a0c3773c3 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -431,7 +431,7 @@ mutt_copy_header (FILE *in, HEADER *h, FILE *out, int flags, const char *prefix)
   {
     /* Add some fake headers based on notmuch data */
     char *folder = nm_header_get_folder(h);
-    if (folder)
+    if (folder && !(option (OPTWEED) && mutt_matches_ignore ("folder")))
     {
       char buffer[LONG_STRING];
       strfcpy (buffer, folder, sizeof (buffer));
@@ -442,7 +442,7 @@ mutt_copy_header (FILE *in, HEADER *h, FILE *out, int flags, const char *prefix)
       fputc ('\n', out);
     }
     char *tags = nm_header_get_tags(h);
-    if (tags)
+    if (tags && !(option (OPTWEED) && mutt_matches_ignore ("tags")))
     {
       fputs ("Tags: ", out);
       fputs (tags, out);