From: Thomas Roessler <roessler@does-not-exist.org>
Date: Fri, 17 Mar 2000 08:20:27 +0000 (+0000)
Subject: Don't override iso-2022-jp with us-ascii.
X-Git-Tag: mutt-1-1-10-rel~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=109e00924aeb353f4af3a90df4ac622d80d1d798;p=mutt

Don't override iso-2022-jp with us-ascii.
---

diff --git a/rfc2047.c b/rfc2047.c
index 01358f6a..786803aa 100644
--- a/rfc2047.c
+++ b/rfc2047.c
@@ -41,7 +41,7 @@ static void q_encode_string (char *d,
   for(t = s; *t && !hibit; t++)
     if(*t & 0x80) hibit = 1;
 
-  if(hibit)
+  if(hibit || !mutt_strcasecmp (send_charset, "iso-2022-jp"))
   {
     snprintf (charset, sizeof (charset), "=?%s?Q?",
 	      mutt_strcasecmp ("us-ascii", send_charset) == 0 ? "unknown-8bit" : NONULL(send_charset));
diff --git a/sendlib.c b/sendlib.c
index e089e1f5..1181ad1e 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -852,6 +852,9 @@ static const char *get_text_charset (BODY *b, CONTENT *info)
   if (info->hibin || !strcasecmp (chsname, "utf-7"))
     return (chsname);
 
+  if (info->lobin && !strcasecmp (chsname, "iso-2022-jp"))
+    return (chsname);
+  
   return ("us-ascii");
 }