Import madtty, use it to deal with colors from now on as it needs to know what is...

[apps/madmutt.git] / init.c

diff --git a/init.c b/init.c
index 7106e97..323d5ac 100644 (file)
--- a/init.c
+++ b/init.c
@@ -433,9 +433,7 @@ int query_quadoption2(int v, const char *prompt)
     return (v);
 
   default:
-    v = mutt_yesorno(prompt, (v == M_ASKYES));
-    CLEARLINE(main_w, LINES - 1);
-    return (v);
+    return mutt_yesorno(prompt, (v == M_ASKYES));
   }
 }
 
@@ -449,12 +447,8 @@ int query_quadoption (int opt, const char *prompt)
     return (v);
 
   default:
-    v = mutt_yesorno (prompt, (v == M_ASKYES));
-    CLEARLINE(main_w, LINES - 1);
-    return (v);
+    return mutt_yesorno(prompt, (v == M_ASKYES));
   }
-
-  /* not reached */
 }
 
 /* always wise to do what someone else did before */
@@ -882,7 +876,7 @@ static void mutt_set_default(const char *name __attribute__ ((unused)), void* p,
         return;
 
     mutt_option_value(ptr->option, buf, sizeof(buf));
-    if (m_strlen(ptr->init) == 0 && buf && *buf)
+    if (m_strlen(ptr->init) == 0 && *buf)
         ptr->init = m_strdup(buf);
 }
 
@@ -1655,27 +1649,6 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
     Realname = m_strdup(rnbuf);
   }
 
-#ifdef USE_NNTP
-  {
-    FILE *f;
-    char *q;
-
-    if ((f = safe_fopen (SYSCONFDIR "/nntpserver", "r"))) {
-      buffer[0] = '\0';
-      fgets (buffer, sizeof(buffer), f);
-      p = vskipspaces(buffer);
-      q = (char*)p;
-      while (*q && !isspace(*q))
-        q++;
-      *q = '\0';
-      NewsServer = m_strdup(p);
-      m_fclose(&f);
-    }
-  }
-  if ((p = getenv ("NNTPSERVER")))
-    NewsServer = m_strdup(p);
-#endif
-
   if ((p = getenv("MAIL") ?: getenv("MAILDIR"))) {
     Spoolfile = m_strdup(p);
   } else {