X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=main.c;h=adb387d16b2404c0855017e8d9090420d771e317;hp=9e2ef3741e309e92249c8d0b1668d1a6a8d99a66;hb=fc7b90fd61ac9efd35a5b506cc10679969d84cba;hpb=a3570e5059a0cbb884fce42a12be470addb770fa

diff --git a/main.c b/main.c
index 9e2ef37..adb387d 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
@@ -370,11 +366,7 @@ static void show_version (void)
   printf ("  +PKGDATADIR=\"%s\"\n", PKGDATADIR);
   printf ("  +PKGDOCDIR=\"%s\"\n", PKGDOCDIR);
   printf ("  +SYSCONFDIR=\"%s\"\n", SYSCONFDIR);
-#ifdef MIXMASTER
   printf ("  +MIXMASTER=\"%s\"\n\n", MIXMASTER);
-#else
-  puts ("  -MIXMASTER\n");
-#endif
 
   puts (_("MadMutt is based on Madmutt wich was based on Mutt before\n"));
 
@@ -859,5 +851,6 @@ int main (int argc, char **argv)
     mutt_endwin (Errorbuf);
   }
 
+  mlua_shutdown();
   exit (0);
 }