small touchups

[apps/madmutt.git] / init.c

diff --git a/init.c b/init.c
index 522557f..2999e7e 100644 (file)
--- a/init.c
+++ b/init.c
@@ -1682,12 +1682,12 @@ static int source_rc (const char *rcfile, BUFFER * err)
 
   p_clear(&token, 1);
   while ((linebuf = mutt_read_line(linebuf, &buflen, f, &line)) != NULL) {
-    conv = ConfigCharset && (*ConfigCharset) && Charset;
+    conv = ConfigCharset && (*ConfigCharset) && MCharset.charset;
     if (conv) {
       currentline = m_strdup(linebuf);
       if (!currentline)
         continue;
-      mutt_convert_string (&currentline, ConfigCharset, Charset, 0);
+      mutt_convert_string (&currentline, ConfigCharset, MCharset.charset, 0);
     }
     else
       currentline = linebuf;
@@ -2253,8 +2253,6 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
   if ((p = getenv ("EMAIL")) != NULL)
     From = rfc822_parse_adrlist (NULL, p);
 
-  charset_initialize();
-
   /* Set standard defaults */
   hash_map (ConfigOptions, mutt_set_default, 0);
   hash_map (ConfigOptions, mutt_restore_default, 0);