#include <imap/imap_private.h>
#ifdef USE_NNTP
-#include <nntp/nntp.h>
+#include "nntp.h"
#endif
static const char *No_mailbox_is_open = N_("No mailbox is open.");
HEADER *h = Context->hdrs[Context->v2r[num]];
THREAD *tmp;
- if (option(OPTARROWCURSOR))
- flag |= M_FORMAT_ARROWCURSOR;
-
if ((Sort & SORT_MASK) == SORT_THREADS && h->tree) {
flag |= M_FORMAT_TREE; /* display the thread tree */
if (h->display_subject)
else
menu->oldcurrent = -1;
- if (option (OPTARROWCURSOR))
- move (menu->current - menu->top + menu->offset, 2);
- else if (option (OPTBRAILLEFRIENDLY))
+ if (option (OPTBRAILLEFRIENDLY))
move (menu->current - menu->top + menu->offset, 0);
else
move (menu->current - menu->top + menu->offset, COLS - 1);
menu->current = mutt_thread_next_unread (Context, CURHDR);
}
- if (option (OPTPGPAUTODEC) &&
- (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED)))
+ if (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED))
mutt_check_traditional_pgp (tag ? NULL : CURHDR, &menu->redraw);
if ((op = mutt_display_message (CURHDR)) == -1) {
CHECK_MX_ACL (Context, ACL_INSERT, _("Editing"));
- if (option (OPTPGPAUTODEC)
- && (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED)))
+ if (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED))
mutt_check_traditional_pgp (tag ? NULL : CURHDR, &menu->redraw);
mutt_edit_message (Context, tag ? NULL : CURHDR);
menu->redraw = REDRAW_FULL;
CHECK_VISIBLE;
CHECK_ATTACH;
- if (option (OPTPGPAUTODEC) &&
- (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED)))
+ if (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED))
mutt_check_traditional_pgp (tag ? NULL : CURHDR, &menu->redraw);
ci_send_message (SENDFORWARD, NULL, NULL, Context, tag ? NULL : CURHDR);
menu->redraw = REDRAW_FULL;
CHECK_VISIBLE;
CHECK_ATTACH;
- if (option (OPTPGPAUTODEC) &&
- (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED)))
+ if (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED))
mutt_check_traditional_pgp (tag ? NULL : CURHDR, &menu->redraw);
ci_send_message (SENDREPLY | SENDGROUPREPLY, NULL, NULL, Context,
CHECK_MSGCOUNT;
CHECK_VISIBLE;
- if (option (OPTPGPAUTODEC) &&
- (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED)))
+ if (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED))
mutt_check_traditional_pgp (tag ? NULL : CURHDR, &menu->redraw);
ci_send_message (SENDREPLY | SENDLISTREPLY, NULL, NULL, Context,
break;
case OP_PIPE:
-
CHECK_MSGCOUNT;
CHECK_VISIBLE;
mutt_pipe_message (tag ? NULL : CURHDR);
- /* in an IMAP folder index with imap_peek=no, piping could change
- * * new or old messages status to read. Redraw what's needed.
- */
- if (Context->magic == M_IMAP && !option (OPTIMAPPEEK)) {
- menu->redraw = (tag ? REDRAW_INDEX : REDRAW_CURRENT) | REDRAW_STATUS;
- }
MAYBE_REDRAW (menu->redraw);
break;
case OP_PRINT:
-
CHECK_MSGCOUNT;
CHECK_VISIBLE;
mutt_print_message (tag ? NULL : CURHDR);
- /* in an IMAP folder index with imap_peek=no, piping could change
- * * new or old messages status to read. Redraw what's needed.
- */
- if (Context->magic == M_IMAP && !option (OPTIMAPPEEK)) {
- menu->redraw = (tag ? REDRAW_INDEX : REDRAW_CURRENT) | REDRAW_STATUS;
- }
break;
case OP_MAIN_READ_THREAD:
case OP_MAIN_READ_SUBTHREAD:
-
CHECK_MSGCOUNT;
CHECK_VISIBLE;
CHECK_READONLY;
CHECK_MSGCOUNT;
CHECK_VISIBLE;
- if (option (OPTPGPAUTODEC) &&
- (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED)))
+ if (tag || !(CURHDR->security & PGP_TRADITIONAL_CHECKED))
mutt_check_traditional_pgp (tag ? NULL : CURHDR, &menu->redraw);
ci_send_message (SENDREPLY, NULL, NULL, Context, tag ? NULL : CURHDR);