[unstable] Adding experimental new character set conversion code.

1 files changed, 2 insertions, 14 deletions

diff --git a/sendlib.c b/sendlib.c
index 3ceb65b4..a44e6e68 100644
--- a/sendlib.c
+++ b/sendlib.c
@@ -554,7 +554,6 @@ static CONTENT *mutt_get_content_info (const char *fname)
 {
   CONTENT *info;
   FILE *fp;
-  CHARSET_MAP *cm;
   int ch, from=0, whitespace=0, dot=0, linelen=0;
 
   if ((fp = fopen (fname, "r")) == NULL)
@@ -564,12 +563,6 @@ static CONTENT *mutt_get_content_info (const char *fname)
     return (NULL);
   }
 
-  {
-    CHARSET *cs;
-
-    cm = (cs = mutt_get_charset(Charset)) ? cs->map : 0;
-  }
-
   info = safe_calloc (1, sizeof (CONTENT));
   while ((ch = fgetc (fp)) != EOF)
   {
@@ -642,8 +635,7 @@ static CONTENT *mutt_get_content_info (const char *fname)
       if (ch == ' ') whitespace++;
       info->ascii++;
     }
-    if (cm && mutt_unicode_char (cm, ch) & -128)
-      info->nonasc = 1;
+
     if (linelen > 1) dot = 0;
     if (ch != ' ' && ch != '\t') whitespace = 0;
   }
@@ -748,15 +740,11 @@ static int lookup_mime_type (char *d, const char *s)
 
 static char *set_text_charset (CONTENT *info)
 {
-  CHARSET *cs;
-
-  /* if charset is unknown assume low bytes are ascii compatible */
-
   if ((Charset == NULL || mutt_strcasecmp (Charset, "us-ascii") == 0)
       && info->hibin)
     return ("unknown-8bit");
 
-  if (((cs = mutt_get_charset (Charset)) && cs->map) ? info->nonasc : info->hibin)
+  if (info->hibin)
     return (Charset);
 
   return ("us-ascii");