X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=parse.c;h=64b22f47a9c957875f145b7d89b9e0f0b61ffdae;hp=584d62b84139818f48a07cd046ee8a34aaa06d3d;hb=fa7f733a61a6fe3143198791ab470ddf4d08fdbe;hpb=841934011451205d8295ac955486f06c317fdf15;ds=sidebyside diff --git a/parse.c b/parse.c index 584d62b..64b22f4 100644 --- a/parse.c +++ b/parse.c @@ -12,7 +12,6 @@ #endif #include "mutt.h" -#include "mutt_regex.h" #include "mailbox.h" #include "mime.h" #include "rfc2047.h" @@ -20,6 +19,11 @@ #include "mutt_crypt.h" #include "url.h" +#include "lib/mem.h" +#include "lib/intl.h" +#include "lib/str.h" +#include "lib/rx.h" + #include #include #include @@ -1347,7 +1351,7 @@ ENVELOPE *mutt_read_rfc822_header (FILE * f, HEADER * hdr, short user_hdrs, *buf = '\0'; if (mutt_match_spam_list (line, SpamList, buf, sizeof (buf))) { - if (!mutt_match_rx_list (line, NoSpamList)) { + if (!rx_list_match (NoSpamList, line)) { /* if spam tag already exists, figure out how to amend it */ if (e->spam && *buf) {