X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=alias.cpkg;h=d11d89987952c0d95abd648a131086b384e2135d;hp=c4e739e687210c036f4582ffda010c07034d98ac;hb=aed03232cc25bcb1104a17c631924b867659944c;hpb=05039d8ea34618b385736ae6d7578b1643fad3d2

diff --git a/alias.cpkg b/alias.cpkg
index c4e739e..d11d899 100644
--- a/alias.cpkg
+++ b/alias.cpkg
@@ -207,10 +207,10 @@ int mutt_addr_is_user(address_t *addr)
     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;
@@ -445,7 +445,7 @@ static address_t *mutt_expand_aliases_r(address_t *a, string_list_t **expn)
 
                 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);
                 }
             }
@@ -454,7 +454,7 @@ static address_t *mutt_expand_aliases_r(address_t *a, string_list_t **expn)
         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));
     }
@@ -617,8 +617,7 @@ alias_format_str(char *dest, ssize_t destlen, char op, const char *src,
 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)