#include "remailer.h"
#ifdef USE_NNTP
-#include <nntp/nntp.h>
+#include "nntp.h"
#endif
#define CHECK_COUNT \
static void snd_entry (char *b, ssize_t blen, MUTTMENU * menu, int num) {
m_strformat(b, blen, COLS - SW, AttachFormat, mutt_attach_fmt,
- ((ATTACHPTR **)menu->data)[num],
- M_FORMAT_STAT_FILE | (option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0));
+ ((ATTACHPTR **)menu->data)[num], M_FORMAT_STAT_FILE);
}
static void redraw_crypt_lines (HEADER * msg)
mutt_paddstr (W, NONULL (msg->env->newsgroups));
mvprintw (HDR_CC, SW, TITLE_FMT, Prompts[HDR_FOLLOWUPTO - 1]);
mutt_paddstr (W, NONULL (msg->env->followup_to));
- if (option (OPTXCOMMENTTO)) {
- mvprintw (HDR_BCC, 0, TITLE_FMT, Prompts[HDR_XCOMMENTTO - 1]);
- mutt_paddstr (W, NONULL (msg->env->x_comment_to));
- }
}
#endif
mvprintw (HDR_SUBJECT, SW, TITLE_FMT, Prompts[HDR_SUBJECT - 1]);
case 'h': /* hostname */
snprintf (fmt, sizeof (fmt), "%%%ss", prefix);
- snprintf (buf, buflen, fmt, NONULL(MCore.shorthost));
+ snprintf (buf, buflen, fmt, NONULL(mod_core.shorthost));
break;
case 'l': /* approx length of current message in bytes */
}
break;
- case OP_COMPOSE_EDIT_X_COMMENT_TO:
- if (news && option (OPTXCOMMENTTO)) {
- buf[0] = 0;
- if (msg->env->x_comment_to)
- m_strcpy(buf, sizeof(buf), msg->env->x_comment_to);
- if (mutt_get_field ("X-Comment-To: ", buf, sizeof (buf), 0) == 0
- && buf[0]) {
- p_delete(&msg->env->x_comment_to);
- msg->env->x_comment_to = m_strdup(buf);
- move (HDR_BCC, HDR_XOFFSET);
- clrtoeol ();
- if (msg->env->x_comment_to)
- printw ("%-*.*s", W, W, msg->env->x_comment_to);
- }
- }
- break;
#endif
case OP_COMPOSE_EDIT_SUBJECT:
if (msg->env->subject)