Cosmetic fixes to MIME headers. Closes: #2086.

diff --git a/copy.c b/copy.c
index 61bffc092fb8ff353d90ddb13b1c6e5b0db4a31e..c92d95ea1798d0fbb0f8ec2a4e588f7b11cf5522 100644 (file)
--- a/copy.c
+++ b/copy.c
@@ -364,7 +364,7 @@ mutt_copy_header (FILE *in, HEADER *h, FILE *out, int flags, const char *prefix)
   if (flags & CH_TXTPLAIN)
   {
     char chsbuf[SHORT_STRING];
-    fputs ("Mime-Version: 1.0\n", out);
+    fputs ("MIME-Version: 1.0\n", out);
     fputs ("Content-Transfer-Encoding: 8bit\n", out);
     fputs ("Content-Type: text/plain; charset=", out);
     mutt_canonical_charset (chsbuf, sizeof (chsbuf), Charset ? Charset : "us-ascii");
@@ -672,7 +672,7 @@ _mutt_copy_message (FILE *fpout, FILE *fpin, HEADER *hdr, BODY *body,
     {
       if (crypt_pgp_decrypt_mime (fpin, &fp, hdr->content, &cur))
        return (-1);
-      fputs ("Mime-Version: 1.0\n", fpout);
+      fputs ("MIME-Version: 1.0\n", fpout);
     }
 
     if ((WithCrypto & APPLICATION_SMIME)

diff --git a/mutt.h b/mutt.h
index 205afdbe4aa30d844741f0d8a37bd718033134f8..533619780443548ac0a25a5756088d92fdfed326 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -692,7 +692,7 @@ typedef struct header
   unsigned int security : 11;  /* bit 0-6: flags, bit 7,8: application.
                                 see: crypt.h pgplib.h, smime.h */
 
-  unsigned int mime : 1;               /* has a Mime-Version header? */
+  unsigned int mime : 1;               /* has a MIME-Version header? */
   unsigned int flagged : 1;            /* marked important? */
   unsigned int tagged : 1;
   unsigned int deleted : 1;

diff --git a/parse.c b/parse.c
index 869f8e9f1f224c326ea2d5f5efb58ac6025a6d89..3d15af3eb34c16d5fa64bddba7f757a0bc585264 100644 (file)
--- a/parse.c
+++ b/parse.c
@@ -1105,7 +1105,7 @@ int mutt_parse_rfc822_line (ENVELOPE *e, HEADER *hdr, char *line, char *p, short
     }
     else if (!ascii_strcasecmp (line + 1, "essage-id"))
     {
-      /* We add a new "Message-Id:" when building a message */
+      /* We add a new "Message-ID:" when building a message */
       FREE (&e->message_id);
       e->message_id = extract_message_id (p);
       matched = 1;

diff --git a/sendlib.c b/sendlib.c
index 99c1c39ed222eae30e7a2b948f9e9ce4ac133463..95758d76d22e048b99ca76af9a1d3838250b1b2f 100644 (file)
--- a/sendlib.c
+++ b/sendlib.c
@@ -1057,7 +1057,7 @@ void mutt_message_to_7bit (BODY *a, FILE *fp)
   mutt_copy_hdr (fpin, fpout, a->offset, a->offset + a->length, 
                 CH_MIME | CH_NONEWLINE | CH_XMIT, NULL);
 
-  fputs ("Mime-Version: 1.0\n", fpout);
+  fputs ("MIME-Version: 1.0\n", fpout);
   mutt_write_mime_header (a->parts, fpout);
   fputc ('\n', fpout);
   mutt_write_mime_body (a->parts, fpout);
@@ -1614,7 +1614,7 @@ int mutt_write_rfc822_header (FILE *fp, ENVELOPE *env, BODY *attach,
     }
 
     /* Add the MIME headers */
-    fputs ("Mime-Version: 1.0\n", fp);
+    fputs ("MIME-Version: 1.0\n", fp);
     mutt_write_mime_header (attach, fp);
   }
 

diff --git a/thread.c b/thread.c
index 20ddb677b128c94002dec0abb342ad8b6a55c5f6..b3bf5f76ea096d9c5a16575730e1d655e818e296 100644 (file)
--- a/thread.c
+++ b/thread.c
@@ -1374,7 +1374,7 @@ static void clean_references (THREAD *brk, THREAD *cur)
     {
       HEADER *h = cur->message;
 
-      /* clearing the References: header from obsolete Message-Id(s) */
+      /* clearing the References: header from obsolete Message-ID(s) */
       mutt_free_list (&ref->next);
 
       h->env->refs_changed = h->changed = 1;