* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <errno.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <stdlib.h>
-
#include <lib-lib/lib-lib.h>
#include <lib-sys/unix.h>
#include <lib-ui/curses.h>
#include <lib-ui/enter.h>
#include <lib-ui/menu.h>
+#include <lib-mx/mx.h>
#include "mutt.h"
#include "alias.h"
#include "recvattach.h"
#include "sort.h"
#include "charset.h"
-#include "mx.h"
#include "buffy.h"
-#include "compose.h"
-
-#ifdef MIXMASTER
#include "remailer.h"
-#endif
#ifdef USE_NNTP
-#include "nntp.h"
+#include <nntp/nntp.h>
#endif
static const char *There_are_no_attachments = N_("There are no attachments.");
HDR_SUBJECT,
HDR_REPLYTO,
HDR_FCC,
-
-#ifdef MIXMASTER
HDR_MIX,
-#endif
HDR_CRYPT,
HDR_CRYPTINFO,
"Bcc: ",
"Subject: ",
"Reply-To: ",
- "Fcc: "
+ "Fcc: ",
#ifdef USE_NNTP
-#ifdef MIXMASTER
- , ""
-#endif
- , "", "", "Newsgroups: ", "Followup-To: ", "X-Comment-To: "
+ "",
+ "", "", "Newsgroups: ", "Followup-To: ", "X-Comment-To: "
#endif
};
}
}
-
-#ifdef MIXMASTER
-
static void redraw_mix_line (string_list_t * chain)
{
int c;
c += m_strlen(t) + 2;
}
}
-#endif /* MIXMASTER */
static int check_attachments (ATTACHPTR ** idx, short idxlen)
{
mutt_paddstr (W, fcc);
redraw_crypt_lines (msg);
-
-#ifdef MIXMASTER
redraw_mix_line (msg->chain);
-#endif
SETCOLOR (MT_COLOR_STATUS);
mvaddstr (HDR_ATTACH - 1, SW, _("-- Attachments"));
* help when modifying this function.
*/
+static void compose_status_line (char *buf, ssize_t buflen, MUTTMENU * menu,
+ const char *p);
+
static const char *compose_format_str (char *buf, ssize_t buflen, char op,
const char *src, const char *prefix,
const char *ifstring,
break;
}
-
-#ifdef MIXMASTER
if (msg->chain && mix_check_message (msg) != 0)
break;
-#endif
if (!fccSet && *fcc) {
if ((i = query_quadoption (OPT_COPY,
idx[menu->current]->content->unlink =
!idx[menu->current]->content->unlink;
-#if 0
- /* OPTRESOLVE is otherwise ignored on this menu.
- * Where's the bug?
- */
-
- if (option (OPTRESOLVE) && menu->current + 1 < menu->max)
- menu->current++;
-# endif
menu->redraw = REDRAW_INDEX;
/* No send2hook since this doesn't change the message. */
break;
p_delete(&idx[idxlen]);
continue;
}
- fclose (fp);
+ m_fclose(&fp);
if ((idx[idxlen]->content = mutt_make_file_attach (fname)) == NULL) {
mutt_error
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
-
-#ifdef MIXMASTER
case OP_COMPOSE_MIX:
-
mix_make_chain (&msg->chain, &menu->redraw);
mutt_message_hook (NULL, msg, M_SEND2HOOK);
break;
-#endif
-
}
/* Draw formated compose status line */