#include "menu.h"
#include "mutt.h"
+#include "pattern.h"
#include "alias.h"
#include "sort.h"
#include "recvattach.h"
void index_make_entry (char *s, ssize_t l, struct menu_t * menu, int num)
{
- format_flag flag =
- M_FORMAT_MAKEPRINT | M_FORMAT_ARROWCURSOR | M_FORMAT_INDEX;
+ format_flag flag = M_FORMAT_MAKEPRINT | M_FORMAT_INDEX;
int edgemsgno, reverse = Sort & SORT_REVERSE;
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)
*/
int mutt_index_menu (void)
{
- char buf[LONG_STRING], helpstr[SHORT_STRING];
+ char buf[LONG_STRING], helpstr[STRING];
int flags;
int op = OP_NULL;
int done = 0; /* controls when to exit the "event" loop */
sidebar_draw ();
mutt_message (_("New mail in this mailbox."));
- if (option (OPTBEEPNEW))
+ if (MCore.beep_new)
beep ();
}
else if (check == M_FLAGS)
menu->redraw |= REDRAW_SIDEBAR;
}
if (do_buffy_notify) {
- if (buffy_notify () && option (OPTBEEPNEW))
+ if (buffy_notify () && MCore.beep_new)
beep ();
}
else
if (op == OP_TOGGLE_READ) {
char buffer[LONG_STRING];
- if (!Context->pattern
- || strncmp (Context->pattern, "!~R!~D~s", 8) != 0) {
+ if (m_strncmp (Context->pattern, "!~R!~D~s", 8) != 0) {
snprintf (buffer, sizeof (buffer), "!~R!~D~s%s",
Context->pattern ? Context->pattern : ".*");
set_option (OPTHIDEREAD);
}
else {
m_strcpy(buf, sizeof(buf), Context->pattern + 8);
- if (!*buf || strncmp (buf, ".*", 2) == 0)
+ if (m_strncmp (buf, ".*", 2) == 0)
snprintf (buf, sizeof (buf), "~A");
unset_option (OPTHIDEREAD);
}
break;
}
- if (query_quadoption (OPT_QUIT, _("Quit Madmutt?")) == M_YES) {
+ if (query_quadoption2(MCore.quit, _("Quit Madmutt?")) == M_YES) {
int check;
oldcount = Context ? Context->msgcount : 0;
}
if ((menu->menu == MENU_MAIN)
- && (query_quadoption (OPT_QUIT,
+ && (query_quadoption2(MCore.quit,
_("Exit Madmutt without saving?")) == M_YES))
{
if (Context) {
menu->redraw = REDRAW_FULL;
break;
-
- case OP_FORGET_PASSPHRASE:
- crypt_forget_passphrase ();
- break;
-
case OP_GROUP_REPLY:
CHECK_MSGCOUNT;
if (menu->menu == MENU_PAGER) {
menu->menu = MENU_MAIN;
menu->redraw = REDRAW_FULL;
-#if 0
- set_option (OPTWEED); /* turn header weeding back on. */
-#endif
}
if (done)