Various nits, noted by Gero Treuner.

diff --git a/charset.h b/charset.h
index ad9be9fb6b56ade0fbc52c6aeefa7187b591e288..4943da146aaf228f31d97df3e325fd6c94c9d9a8 100644 (file)
--- 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 f999f80ea872402ec191129105b11f8fa225e17f..37ed629a86d355bff556a0914fecde1558ab765f 100644 (file)
--- 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 9d5724a47ba62c7721f781af6c7d4dbb8c4640d1..2107dc059498d55352a481d6c2925a25eb56cc49 100644 (file)
--- 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 202b4c63958635cb662e9205b1f0a4fec05bfc73..d48bd5347f2fc902c78fec5cfa7c7c5cc0771d6f 100644 (file)
--- 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)