Merging the external character set patch into unstable.

Additionally, this change introduces a M_CHARCONV state flag which
gives us some more control about when character set conversions are
actually done.  Current versions of mutt would happily apply
character set conversions when, e.g., saving a text/plain attachment
to a file.  (We had at least one corrupt russing translation file
due to this mis-feature.)

Additionally, we clean up some of the character set related code in
handler.c.  Most of that is now done by the decoder functions in
charset.c.

1 files changed, 2 insertions, 2 deletions

diff --git a/send.c b/send.c
index 478b5e62..743ad15f 100644
--- a/send.c
+++ b/send.c
@@ -337,7 +337,7 @@ static int include_forward (CONTEXT *ctx, HEADER *cur, FILE *out)
   fputs (" -----\n\n", out);
   if (option (OPTFORWDECODE))
   {
-    cmflags |= M_CM_DECODE;
+    cmflags |= M_CM_DECODE | M_CM_CHARCONV;
     if (option (OPTFORWWEEDHEADER))
     {
       chflags |= CH_WEED;
@@ -355,7 +355,7 @@ static int include_forward (CONTEXT *ctx, HEADER *cur, FILE *out)
 static int include_reply (CONTEXT *ctx, HEADER *cur, FILE *out)
 {
   char buffer[STRING];
-  int flags = M_CM_PREFIX | M_CM_DECODE;
+  int flags = M_CM_PREFIX | M_CM_DECODE | M_CM_CHARCONV;