Move things around: more DT_SYS variables into the lua !

[apps/madmutt.git] / muttlib.c

diff --git a/muttlib.c b/muttlib.c
index 57fabf3..1aadda3 100644 (file)
--- a/muttlib.c
+++ b/muttlib.c
@@ -21,7 +21,6 @@
 #include "alias.h"
 #include "mutt.h"
 #include "attach.h"
-#include "version.h"
 
 /* Modified by blong to accept a "suggestion" for file name.  If
  * that file exists, then construct one with unique name but 
@@ -380,17 +379,10 @@ void mutt_sleep (short s)
     sleep(MAX(s, SleepTime));
 }
 
-const char *mutt_make_version (int full)
+const char *mutt_make_version(void)
 {
   static char vstring[STRING];
-
-  if (full)
-    snprintf (vstring, sizeof (vstring),
-              "Madmutt/%s-r%s (based on Mutt 1.5.11)",
-              MUTT_VERSION, MUTT_REVISION);
-  else
-    snprintf (vstring, sizeof (vstring), "Madmutt/%s-%s",
-              MUTT_VERSION, MUTT_REVISION);
+  snprintf(vstring, sizeof (vstring), "Madmutt/%s", MUTT_VERSION);
   return vstring;
 }
 
@@ -501,7 +493,6 @@ int mutt_extract_token(BUFFER *dest, BUFFER *tok, int flags)
             if ((ISSPACE(ch) && !(flags & M_TOKEN_SPACE))
             || (ch == '#' && !(flags & M_TOKEN_COMMENT))
             || (ch == '=' && (flags & M_TOKEN_EQUAL))
-            || (ch == ';' && !(flags & M_TOKEN_SEMICOLON))
             || ((flags & M_TOKEN_PATTERN) && strchr("~=!|", ch)))
             {
                 break;