X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=lib-ui%2Fcurs_main.c;h=c7d47128f5dce9b0838b06f962058ec8c672f836;hb=1d2617e5d89468db7cd1b93fd2b31af73cd7c8ff;hp=f74a23e95c01b1e5d214c091db4817565d2895ed;hpb=8e075eda08c6f099ec6988e16607fb4f6a10ba92;p=apps%2Fmadmutt.git

diff --git a/lib-ui/curs_main.c b/lib-ui/curs_main.c
index f74a23e..c7d4712 100644
--- a/lib-ui/curs_main.c
+++ b/lib-ui/curs_main.c
@@ -14,14 +14,13 @@
 
 #include <lib-ui/sidebar.h>
 #include <lib-mx/mx.h>
-#include <lib-crypt/crypt.h>
-
 #include <pop/pop.h>
 
 #include "curses.h"
 #include "menu.h"
 
 #include "mutt.h"
+#include "crypt.h"
 #include "pattern.h"
 #include "alias.h"
 #include "sort.h"
@@ -97,12 +96,14 @@ extern size_t UngetCount;
 
 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)
@@ -386,7 +387,7 @@ struct mapping_t IndexNewsHelp[] = {
  */
 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 */
@@ -477,7 +478,7 @@ int mutt_index_menu (void)
           sidebar_draw ();
           mutt_message (_("New mail in this mailbox."));
 
-          if (option (OPTBEEPNEW))
+          if (MCore.beep_new)
             beep ();
         }
         else if (check == M_FLAGS)
@@ -504,7 +505,7 @@ int mutt_index_menu (void)
         menu->redraw |= REDRAW_SIDEBAR;
       }
       if (do_buffy_notify) {
-        if (buffy_notify () && option (OPTBEEPNEW))
+        if (buffy_notify () && MCore.beep_new)
           beep ();
       }
       else
@@ -972,7 +973,7 @@ int mutt_index_menu (void)
         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;
@@ -1300,7 +1301,7 @@ int mutt_index_menu (void)
       }
 
       if ((menu->menu == MENU_MAIN)
-          && (query_quadoption (OPT_QUIT,
+          && (query_quadoption2(MCore.quit,
                                 _("Exit Madmutt without saving?")) == M_YES))
       {
         if (Context) {
@@ -1992,11 +1993,6 @@ int mutt_index_menu (void)
       menu->redraw = REDRAW_FULL;
       break;
 
-
-    case OP_FORGET_PASSPHRASE:
-      crypt_forget_passphrase ();
-      break;
-
     case OP_GROUP_REPLY:
 
       CHECK_MSGCOUNT;
@@ -2034,13 +2030,6 @@ int mutt_index_menu (void)
       menu->redraw = REDRAW_FULL;
       break;
 
-    case OP_MAIL_KEY:
-      CHECK_ATTACH;
-      ci_send_message (SENDKEY, NULL, NULL, NULL, NULL);
-      menu->redraw = REDRAW_FULL;
-      break;
-
-
     case OP_EXTRACT_KEYS:
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;