X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=init.c;h=4fe7d969151276d2f461ebc19fff820cb71c672c;hb=2a2f2f9a5bad73c883b7f9c9b4166d932b6aaf37;hp=d45211128e7a089f91545c8937036eaa9ae23b8d;hpb=23e6291cb5d5b4cd2008403d8b628007fd75ff23;p=apps%2Fmadmutt.git

diff --git a/init.c b/init.c
index d452111..4fe7d96 100644
--- a/init.c
+++ b/init.c
@@ -1695,7 +1695,7 @@ static int check_dsn_return (const char* option __attribute__ ((unused)), unsign
 }
 
 /* check whether value for $dsn_notify would be valid */
-static int check_dsn_notify (const char* option, unsigned long p,
+static int check_dsn_notify (const char* option __attribute__ ((unused)), unsigned long p,
                              char* errbuf, ssize_t errlen) {
   list2_t* list = NULL;
   ssize_t i = 0;
@@ -2511,7 +2511,7 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
   const char *p;
   char buffer[STRING], error[STRING];
   int default_rc = 0, need_pause = 0;
-  unsigned int i;
+  int i;
   BUFFER err;
 
   p_clear(&err, 1);
@@ -2661,9 +2661,7 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
   if ((p = getenv ("EMAIL")) != NULL)
     From = rfc822_parse_adrlist (NULL, p);
 
-  mutt_set_langinfo_charset ();
-  mutt_set_charset (Charset);
-
+  charset_initialize();
 
   /* Set standard defaults */
   hash_map (ConfigOptions, mutt_set_default, 0);