Deal with $hostname and $shorthost

[apps/madmutt.git] / alias.cpkg

diff --git a/alias.cpkg b/alias.cpkg
index b6b1dbe..bab4a49 100644 (file)
--- a/alias.cpkg
+++ b/alias.cpkg
@@ -39,7 +39,28 @@
 @import  "lib-lua/base.cpkg"
 
 @static_package MAlias {
+    /*
+     ** .pp
+     ** Specifies the format of the data displayed for the ``alias'' menu. The
+     ** following \fTprintf(3)\fP-style sequences are available:
+     ** .pp
+     ** .dl
+     ** .dt %a .dd alias name
+     ** .dt %f .dd flags - currently, a "d" for an alias marked for deletion
+     ** .dt %n .dd index number
+     ** .dt %r .dd address which alias expands to
+     ** .dt %t .dd character which indicates if the alias is tagged for inclusion
+     ** .de
+     */
     string_t alias_format = m_strdup("%4n %2f %t %-10a   %r");
+    /*
+     ** .pp
+     ** The default file in which to save aliases created by the
+     ** ``$create-alias'' function.
+     ** .pp
+     ** \fBNote:\fP Madmutt will not automatically source this file; you must
+     ** explicitly use the ``$source'' command for it to be executed.
+     */
     path_t   alias_file   = m_strdup("~/.madmutt/aliases");
 };
 
@@ -111,7 +132,7 @@ int mutt_addr_is_user(address_t *addr)
         return 0;
 
     if (!ascii_strcasecmp(addr->mailbox, MCore.username)
-    ||  string_is_address(addr->mailbox, MCore.username, Hostname)
+    ||  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))
     ||  (From && !ascii_strcasecmp(From->mailbox, addr->mailbox)))
@@ -357,7 +378,7 @@ static address_t *mutt_expand_aliases_r(address_t *a, string_list_t **expn)
         last = address_list_append(last, pop);
     }
 
-    if (option(OPTUSEDOMAIN)) {
+    if (MCore.use_domain) {
         /* now qualify all local addresses */
         rfc822_qualify(head, mutt_fqdn(1));
     }