X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.c;h=f86e4650fa33a0a92b5d4a905648f82583accac4;hp=29e6c5feb1bb85966196efe40931ae49167e5f6d;hb=9394fad402116d8b6124a57a8bab1eacd439e5f7;hpb=0dd6b2e7a21a844f2dcc306bb2d36096d3f9b664

diff --git a/init.c b/init.c
index 29e6c5f..f86e465 100644
--- a/init.c
+++ b/init.c
@@ -29,7 +29,7 @@
 #include "mbyte.h"
 #include "charset.h"
 #include "thread.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
 #include "mutt_idna.h"
 
 #if defined(USE_SSL) || defined(USE_GNUTLS)
@@ -2702,7 +2702,6 @@ void mutt_init (int skip_sys_rc, LIST * commands)
       p = "vi";
   }
   Editor = m_strdup(p);
-  Visual = m_strdup(p);
 
   if ((p = getenv ("REPLYTO")) != NULL) {
     BUFFER buf, token;
@@ -2731,14 +2730,11 @@ void mutt_init (int skip_sys_rc, LIST * commands)
 
   CurrentMenu = MENU_MAIN;
 
-
-#ifndef LOCALES_HACK
   /* Do we have a locale definition? */
   if (((p = getenv ("LC_ALL")) != NULL && p[0]) ||
       ((p = getenv ("LANG")) != NULL && p[0]) ||
       ((p = getenv ("LC_CTYPE")) != NULL && p[0]))
     set_option (OPTLOCALES);
-#endif
 
 #ifdef HAVE_GETSID
   /* Unset suspend by default if we're the session leader */