From: Thomas Roessler <roessler@does-not-exist.org>
Date: Mon, 13 Mar 2000 22:36:55 +0000 (+0000)
Subject: Various nits, noted by Gero Treuner.
X-Git-Tag: mutt-1-1-10-rel~32
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=42f22f30aee9d23970ae69413f0bae927189919a;p=mutt

Various nits, noted by Gero Treuner.
---

diff --git a/charset.h b/charset.h
index ad9be9fb..4943da14 100644
--- a/charset.h
+++ b/charset.h
@@ -19,10 +19,6 @@
 #ifndef _CHARSET_H
 #define _CHARSET_H
 
-#define CHARSET_MAGIC "Mutt Character Set Definition 1.1\n"
-
-#ifndef _GEN_CHARSETS
-
 typedef int CHARSET_MAP[256];
 
 typedef struct descr
@@ -95,6 +91,4 @@ int mutt_recode_file (const char *, const char *, const char *);
 unsigned char mutt_display_char(unsigned char, CHARSET_MAP *);
 void mutt_decode_utf8_string(char *, CHARSET *);
 
-#endif
-
 #endif /* _CHARSET_H */
diff --git a/init.h b/init.h
index f999f80e..37ed629a 100644
--- a/init.h
+++ b/init.h
@@ -1402,7 +1402,7 @@ struct option_t MuttVars[] = {
   ** If this variable is set, mutt will try to use the "LAST" POP command
   ** for retrieving only unread messages from the POP server.
   */
-  { "pop_user",		DT_STR,	 R_NONE, UL &PopUser, UL "" },
+  { "pop_user",		DT_STR,	 R_NONE, UL &PopUser, 0 },
   /*
   ** .pp
   ** Your login name on the POP3 server.
diff --git a/makedoc.c b/makedoc.c
index 9d5724a4..2107dc05 100644
--- a/makedoc.c
+++ b/makedoc.c
@@ -205,6 +205,7 @@ static void makedoc (FILE *in, FILE *out)
     }
   }
   flush_doc (docstat, out);
+  fputs ("\n", out);
 }
 
 /* skip whitespace */
diff --git a/send.c b/send.c
index 202b4c63..d48bd534 100644
--- a/send.c
+++ b/send.c
@@ -1048,19 +1048,6 @@ ci_send_message (int flags,		/* send mode */
   {
     msg = mutt_new_header ();
 
-#if 0
-    
-    /* this is no longer used. */
-    
-    if (flags == SENDRESEND)
-    {
-      if (mutt_prepare_template (fp, ctx, msg, cur, 1) < 0)
-	goto cleanup;
-    }
-    else
-
-#endif
-
     if (flags == SENDPOSTPONED)
     {
       if ((flags = mutt_get_postponed (ctx, msg, &cur, fcc, sizeof (fcc))) < 0)