X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.c;h=1e9eaada4499704304302f55b76c101bf2a7f251;hp=96fcf0bc519903f8ca0963dc7959ccebd5c29688;hb=05e61a9707a6da5c0bca77aa7c3c019a918494de;hpb=6b771604433435b4280a5fbae2612134fe4129dd

diff --git a/init.c b/init.c
index 96fcf0b..1e9eaad 100644
--- a/init.c
+++ b/init.c
@@ -2209,12 +2209,12 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
   snprintf (AttachmentMarker, sizeof(AttachmentMarker),
             "\033]9;%ld\a", (long) time (NULL));
 
+  luaM_initialize();
   /* Get some information about the user */
   if ((pw = getpwuid (getuid ()))) {
     char rnbuf[STRING];
-    mutt_gecos_name(rnbuf, sizeof(rnbuf), pw, GecosMask.rx);
+    mutt_gecos_name(rnbuf, sizeof(rnbuf), pw, MCore.gecos_mask);
     Realname = m_strdup(rnbuf);
-    endpwent ();
   }
 
   /* And about the host... */
@@ -2299,7 +2299,6 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
     From = rfc822_parse_adrlist (NULL, p);
 
   charset_initialize();
-  luaM_initialize();
 
   /* Set standard defaults */
   hash_map (ConfigOptions, mutt_set_default, 0);
@@ -2330,8 +2329,6 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
     mutt_expand_path (buffer, sizeof(buffer));
     Muttrc = m_strdup(buffer);
   }
-  p_delete(&AliasFile);
-  AliasFile = m_strdup(NONULL (Muttrc));
 
   /* Process the global rc file if it exists and the user hasn't explicity
      requested not to via "-n".  */