and even less very old hacks.

[apps/madmutt.git] / init.c

diff --git a/init.c b/init.c
index d0c25e1..1c32270 100644 (file)
--- a/init.c
+++ b/init.c
@@ -1818,8 +1818,7 @@ static const struct mapping_t* get_sortmap (struct option_t* option) {
     map = SortBrowserMethods;
     break;
   case DT_SORT_KEYS:
-    if ((WithCrypto & APPLICATION_PGP))
-      map = SortKeyMethods;
+    map = SortKeyMethods;
     break;
   case DT_SORT_AUX:
     map = SortAuxMethods;
@@ -2461,10 +2460,7 @@ int mutt_var_value_complete (char *buffer, size_t len, int pos)
           map = SortBrowserMethods;
           break;
         case DT_SORT_KEYS:
-          if ((WithCrypto & APPLICATION_PGP))
-            map = SortKeyMethods;
-          else
-            map = SortMethods;
+          map = SortKeyMethods;
           break;
         default:
           map = SortMethods;
@@ -2644,15 +2640,12 @@ void mutt_init (int skip_sys_rc, LIST * commands)
   else
     Hostname = m_strdup(utsname.nodename);
 
-#ifndef DOMAIN
-#define DOMAIN buffer
   if (!p && getdnsdomainname (buffer, sizeof(buffer)) == -1)
     Fqdn = m_strdup("@");
   else
-#endif /* DOMAIN */
-  if (*DOMAIN != '@') {
-    Fqdn = p_new(char, m_strlen(DOMAIN) + m_strlen(Hostname) + 2);
-    sprintf (Fqdn, "%s.%s", NONULL (Hostname), DOMAIN); /* __SPRINTF_CHECKED__ */
+  if (*buffer != '@') {
+    Fqdn = p_new(char, m_strlen(buffer) + m_strlen(Hostname) + 2);
+    sprintf (Fqdn, "%s.%s", NONULL(Hostname), buffer); /* __SPRINTF_CHECKED__ */
   }
   else
     Fqdn = m_strdup(NONULL (Hostname));
@@ -2738,14 +2731,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 */