X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=e5dc968e1517b0a0964dcc3fbb163e992820175a;hp=2d2a78976971421cc51dadf08f276e28e4b73781;hb=2dc50decd320b310ef56c14041b6fa4fefd865ac;hpb=1d0ce70b85c36973b50e5783fe7b72941c81c0a9

diff --git a/main.c b/main.c
index 2d2a789..e5dc968 100644
--- a/main.c
+++ b/main.c
@@ -19,6 +19,7 @@
 
 #include <sys/utsname.h>
 
+#include <lib-lua/lib-lua.h>
 #include <lib-sys/mutt_signal.h>
 #include <lib-mime/mime.h>
 #include <lib-ui/curses.h>
@@ -89,7 +90,7 @@ void mutt_exit (int code)
 
 static void mutt_usage (void)
 {
-  puts (mutt_make_version (1));
+  puts (mutt_make_version());
 
   puts
     _("usage: madmutt [ -nRyzZ ] [ -e <cmd> ] [ -F <file> ] [ -m <type> ] [ -f <file> ]\n\
@@ -143,7 +144,7 @@ static void show_version (void)
   char buf[STRING];
 #endif
 
-  puts (mutt_make_version (1));
+  puts (mutt_make_version());
   puts (_(Notice));
 
   uname (&uts);
@@ -269,11 +270,6 @@ static void show_version (void)
          "-HAVE_REGCOMP  "
 #endif
          "\n  "
-#ifdef HAVE_COLOR
-         "+HAVE_COLOR  "
-#else
-         "-HAVE_COLOR  "
-#endif
 #ifdef HAVE_START_COLOR
          "+HAVE_START_COLOR  "
 #else
@@ -728,7 +724,7 @@ int main (int argc, char **argv)
 
       /* is the following if still needed? */
 
-      fout = m_tempfile(buf, sizeof(buf), NONULL(Tempdir), NULL);
+      fout = m_tempfile(buf, sizeof(buf), NONULL(MCore.tmpdir), NULL);
       tempfile = m_strdup(buf);
 
       if (tempfile) {
@@ -855,5 +851,6 @@ int main (int argc, char **argv)
     mutt_endwin (Errorbuf);
   }
 
+  luaM_shutdown();
   exit (0);
 }