X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=init.c;h=45355c7ba00d6be6214bf7d171798c9320004138;hp=93daf2dee839cace37598ce11fc6c8846df0c45b;hb=51239e43fd4a3c2440b4574379e8525d75646b3e;hpb=418e55040ec4a95698a8f1f128f3afbfd6aba48b

diff --git a/init.c b/init.c
index 93daf2d..45355c7 100644
--- a/init.c
+++ b/init.c
@@ -494,6 +494,22 @@ int quadoption (int opt)
   return (QuadOptions[n] >> b) & 0x3;
 }
 
+int query_quadoption2(int opt, const char *prompt)
+{
+  int v = mlua_reggeti(opt);
+
+  switch (v) {
+  case M_YES:
+  case M_NO:
+    return (v);
+
+  default:
+    v = mutt_yesorno(prompt, (v == M_ASKYES));
+    CLEARLINE (LINES - 1);
+    return (v);
+  }
+}
+
 int query_quadoption (int opt, const char *prompt)
 {
   int v = quadoption (opt);
@@ -2184,9 +2200,9 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
   err.data = error;
   err.dsize = sizeof(error);
 
-  ConfigOptions = hash_create (sizeof(MuttVars) * 2);
+  ConfigOptions = hash_create (sizeof(MuttVars) * 2, 0);
   for (i = 0; MuttVars[i].option; i++) {
-    hash_insert (ConfigOptions, MuttVars[i].option, &MuttVars[i], 0);
+    hash_insert (ConfigOptions, MuttVars[i].option, &MuttVars[i]);
   }
 
   /*
@@ -2293,14 +2309,6 @@ void mutt_init (int skip_sys_rc, string_list_t * commands)
 
   Tempdir = m_strdup((p = getenv ("TMPDIR")) ? p : "/tmp");
 
-  p = getenv ("VISUAL");
-  if (!p) {
-    p = getenv ("EDITOR");
-    if (!p)
-      p = "vi";
-  }
-  Editor = m_strdup(p);
-
   if ((p = getenv ("REPLYTO")) != NULL) {
     BUFFER buf, token;