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, 1 insertions, 1 deletions

diff --git a/attach.c b/attach.c
index a7dffddb..e160f115 100644
--- a/attach.c
+++ b/attach.c
@@ -768,7 +768,7 @@ int mutt_decode_save_attachment (FILE *fp, BODY *m, char *path,
   HEADER *saved_hdr = NULL;
 
   memset (&s, 0, sizeof (s));
-  s.flags = displaying ? M_DISPLAY : 0;
+  s.flags = M_CHARCONV | (displaying ? M_DISPLAY : 0);
 
   if (flags == M_SAVE_APPEND)
     s.fpout = safe_fopen (path, "a");