}
rc = mutt_append_message (&tmpctx, ctx, cur, 0, CH_NOLEN |
- ((ctx->magic == M_MBOX
- || ctx->magic == M_MMDF) ? 0 : CH_NOSTATUS));
+ (ctx->magic == M_MBOX ? 0 : CH_NOSTATUS));
oerrno = errno;
mx_close_mailbox (&tmpctx, NULL);
goto bail;
}
- mutt_edit_file (NONULL (Editor), tmp);
+ mutt_edit_file(tmp);
if ((rc = stat (tmp, &sb)) == -1) {
mutt_error (_("Can't stat %s: %s"), tmp, strerror (errno));
}
of = 0;
- cf = ((tmpctx.magic == M_MBOX || tmpctx.magic == M_MMDF) ? 0 : CH_NOSTATUS);
+ cf = (tmpctx.magic == M_MBOX ? 0 : CH_NOSTATUS);
if (fgets (buff, sizeof (buff), fp) && is_from (buff, NULL, 0, NULL)) {
- if (tmpctx.magic == M_MBOX || tmpctx.magic == M_MMDF)
+ if (tmpctx.magic == M_MBOX)
cf = CH_FROM | CH_FORCE_FROM;
- }
- else
+ } else {
of = M_ADD_FROM;
+ }
/*
* XXX - we have to play games with the message flags to avoid
mx_close_mailbox (&tmpctx, NULL);
bail:
- if (fp)
- fclose (fp);
+ m_fclose(&fp);
if (rc >= 0)
unlink (tmp);