if (!addr->mailbox)
return 0;
- if (!ascii_strcasecmp(addr->mailbox, MCore.username)
- || string_is_address(addr->mailbox, MCore.username, MCore.shorthost)
- || string_is_address(addr->mailbox, MCore.username, mutt_fqdn(0))
- || string_is_address(addr->mailbox, MCore.username, mutt_fqdn(1))
+ if (!ascii_strcasecmp(addr->mailbox, mod_core.username)
+ || string_is_address(addr->mailbox, mod_core.username, mod_core.shorthost)
+ || string_is_address(addr->mailbox, mod_core.username, mutt_fqdn(0))
+ || string_is_address(addr->mailbox, mod_core.username, mutt_fqdn(1))
|| (MAlias.from && !ascii_strcasecmp(MAlias.from->mailbox, addr->mailbox)))
{
return 1;
if (pw) {
char namebuf[STRING];
- mutt_gecos_name(namebuf, sizeof(namebuf), pw, MCore.gecos_mask);
+ mutt_gecos_name(namebuf, sizeof(namebuf), pw, mod_core.gecos_mask);
m_strreplace(&pop->personal, namebuf);
}
}
last = address_list_append(last, pop);
}
- if (MCore.use_domain) {
+ if (mod_core.use_domain) {
/* now qualify all local addresses */
rfc822_qualify(head, mutt_fqdn(1));
}
static void alias_entry(char *s, ssize_t slen, MUTTMENU *m, int num)
{
m_strformat(s, slen, COLS - SW, MAlias.alias_format, alias_format_str,
- ((alias_t **)m->data)[num],
- option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
+ ((alias_t **)m->data)[num], 0);
}
static int alias_tag (MUTTMENU * menu, int n, int m)