pc = parameter_getval(ct->parameter, "charset");
if (!pc) {
parameter_setval(&ct->parameter, "charset",
- charset_getfirst(AssumedCharset));
+ charset_getfirst(MCharset.assumed_charset));
}
}
}
/* restore the original line */
line[m_strlen(line)] = ':';
- if (weed && mutt_matches_ignore(line, Ignore)
- && !mutt_matches_ignore(line, UnIgnore)) {
+ if (weed && string_list_contains(Ignore, line, "*")
+ && !string_list_contains(UnIgnore, line, "*")) {
break;
}
{
/* if spam tag already exists, figure out how to amend it */
if (e->spam && *buf) {
- if (SpamSep) {
- /* If SpamSep defined, append with separator */
- mutt_buffer_addstr(e->spam, SpamSep);
- mutt_buffer_addstr(e->spam, buf);
+ if (Mime.spam_separator) {
+ mutt_buffer_addstr(e->spam, Mime.spam_separator);
} else {
- /* else overwrite */
mutt_buffer_reset(e->spam);
- mutt_buffer_addstr(e->spam, buf);
}
+ mutt_buffer_addstr(e->spam, buf);
}
if (!e->spam) {