* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include "copy.h"
#include "charset.h"
#include "mutt_crypt.h"
+#include "lib.h"
#define BUFI_SIZE 1000
int len = strlen(line);
int i;
- fprintf(stderr,"prefix = `%s'\n",s->prefix);
-
width = COLS - WrapMargin - ql - 1;
if (option(OPTSTUFFQUOTED))
--width;
pos=line+ql+width;
oldpos=line+ql;
- if (ql>0 && isblank(*oldpos)) ++oldpos;
+ if (ql>0 && ISBLANK(*oldpos)) ++oldpos;
/* fprintf(stderr,"oldpos = %p line+len = %p\n",oldpos,line+len); */
Quotebuf[0] = '\0';
- if (istext && s->flags & M_CHARCONV)
+ if (istext)
{
- char *charset = mutt_get_parameter ("charset", b->parameter);
- if (charset && Charset)
- cd = mutt_iconv_open (Charset, charset, M_ICONV_HOOK_FROM);
+ if(s->flags & M_CHARCONV)
+ {
+ char *charset = mutt_get_parameter ("charset", b->parameter);
+ if (!option (OPTSTRICTMIME) && !charset)
+ charset = mutt_get_first_charset (AssumedCharset);
+ if (charset && Charset)
+ cd = mutt_iconv_open (Charset, charset, M_ICONV_HOOK_FROM);
+ }
+ else
+ {
+ if (b->file_charset)
+ cd = mutt_iconv_open (Charset, b->file_charset, M_ICONV_HOOK_FROM);
+ }
}
fseek (s->fpin, b->offset, 0);