X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-ui%2Fcurs_main.c;h=4a8a2be862551b83e846dd8bb2ad495cf759d2d3;hp=3fbe0e902a8a83ebc3442c5d303a76703408a042;hb=d2227f502071cc594dbc77ccb0b3f4d0e7b36ae0;hpb=c9b049f668148dab6ae90f32de6a4981f673bfa1

diff --git a/lib-ui/curs_main.c b/lib-ui/curs_main.c
index 3fbe0e9..4a8a2be 100644
--- a/lib-ui/curs_main.c
+++ b/lib-ui/curs_main.c
@@ -10,13 +10,10 @@
  * please see the file GPL in the top level source directory.
  */
 
-#include <lib-lib/lib-lib.h>
-
-#include <lib-ui/sidebar.h>
+#include <lib-ui/lib-ui.h>
 #include <lib-mx/mx.h>
 #include "pop.h"
 
-#include "curses.h"
 #include "menu.h"
 
 #include "mutt.h"
@@ -31,10 +28,6 @@
 
 #include <imap/imap_private.h>
 
-#ifdef USE_NNTP
-#include "nntp.h"
-#endif
-
 static const char *No_mailbox_is_open = N_("No mailbox is open.");
 static const char *There_are_no_messages = N_("There are no messages.");
 static const char *Mailbox_is_read_only = N_("Mailbox is read-only.");
@@ -87,7 +80,6 @@ static const char *No_visible = N_("No visible messages.");
 #define CURHDR Context->hdrs[Context->v2r[menu->current]]
 #define OLDHDR Context->hdrs[Context->v2r[menu->oldcurrent]]
 #define UNREAD(h) mutt_thread_contains_unread (Context, h)
-#define SW              (option(OPTMBOXPANE)?SidebarWidth:0)
 
 extern size_t UngetCount;
 
@@ -350,38 +342,12 @@ static void resort_index (MUTTMENU * menu)
   menu->redraw = REDRAW_INDEX | REDRAW_STATUS;
 }
 
-struct mapping_t IndexHelp[] = {
-  {N_("Quit"), OP_QUIT},
-  {N_("Del"), OP_DELETE},
-  {N_("Undel"), OP_UNDELETE},
-  {N_("Save"), OP_SAVE},
-  {N_("Mail"), OP_MAIL},
-  {N_("Reply"), OP_REPLY},
-  {N_("Group"), OP_GROUP_REPLY},
-  {N_("Help"), OP_HELP},
-  {NULL, OP_NULL}
-};
-
-#ifdef USE_NNTP
-struct mapping_t IndexNewsHelp[] = {
-  {N_("Quit"), OP_QUIT},
-  {N_("Del"), OP_DELETE},
-  {N_("Undel"), OP_UNDELETE},
-  {N_("Save"), OP_SAVE},
-  {N_("Post"), OP_POST},
-  {N_("Followup"), OP_FOLLOWUP},
-  {N_("Catchup"), OP_CATCHUP},
-  {N_("Help"), OP_HELP},
-  {NULL, OP_NULL}
-};
-#endif
-
 /* This function handles the message index window as well as commands returned
  * from the pager (MENU_PAGER).
  */
 int mutt_index_menu (void)
 {
-  char buf[LONG_STRING], helpstr[STRING];
+  char buf[LONG_STRING];
   int flags;
   int op = OP_NULL;
   int done = 0;                 /* controls when to exit the "event" loop */
@@ -404,13 +370,6 @@ int mutt_index_menu (void)
   menu->make_entry = (void *) index_make_entry;
   menu->color = index_color;
   menu->current = ci_first_message ();
-  menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_MAIN,
-#ifdef USE_NNTP
-                                  (Context
-                                   && (Context->magic ==
-                                       M_NNTP)) ? IndexNewsHelp :
-#endif
-                                  IndexHelp);
 
   if (!attach_msg) {
     buffy_check (0);       /* force the buffy check after we enter the folder */
@@ -532,14 +491,13 @@ int mutt_index_menu (void)
 
       if (menu->redraw & REDRAW_STATUS) {
         menu_status_line (buf, sizeof (buf), menu, NONULL (Status));
-        CLEARLINE (option (OPTSTATUSONTOP) ? 0 : LINES - 2);
-        sidebar_draw_frames();
-        SETCOLOR (MT_COLOR_STATUS);
-        BKGDSET (MT_COLOR_STATUS);
-        move(option (OPTSTATUSONTOP) ? 0 : LINES - 2,SW);
-        mutt_paddstr (COLS-SW, buf);
-        SETCOLOR (MT_COLOR_NORMAL);
-        BKGDSET (MT_COLOR_NORMAL);
+        CLEARLINE(main_w, 0);
+        SETCOLOR(main_w, MT_COLOR_STATUS);
+        BKGDSET(main_w, MT_COLOR_STATUS);
+        wmove(main_w, 0, 0);
+        mutt_paddstr (main_w, getmaxx(main_w), buf);
+        SETCOLOR(main_w, MT_COLOR_NORMAL);
+        BKGDSET(main_w, MT_COLOR_NORMAL);
         sidebar_set_buffystats (Context);
         menu->redraw &= ~REDRAW_STATUS;
         if (option (OPTXTERMSETTITLES)) {
@@ -556,25 +514,14 @@ int mutt_index_menu (void)
         menu->oldcurrent = menu->current;
       else
         menu->oldcurrent = -1;
-
-      if (option (OPTBRAILLEFRIENDLY))
-         move (menu->current - menu->top + menu->offset, 0);
-      else
-        move (menu->current - menu->top + menu->offset, COLS - 1);
       mutt_refresh ();
 
       if (SigWinch) {
         mutt_flushinp ();
-        mutt_resize_screen ();
+        ui_layout_resize();
         menu->redraw = REDRAW_FULL;
         menu->menu = MENU_MAIN;
-        SigWinch = 0;
         menu->top = 0;          /* so we scroll the right amount */
-        /*
-         * force a real complete redraw.  clrtobot() doesn't seem to be able
-         * to handle every case without this.
-         */
-        clearok (stdscr, TRUE);
         continue;
       }
 
@@ -600,13 +547,13 @@ int mutt_index_menu (void)
         tag = 1;
 
         /* give visual indication that the next command is a tag- command */
-        mvaddstr (LINES - 1, 0, "tag-");
-        clrtoeol ();
+        mvwaddstr (stdscr, LINES - 1, 0, "tag-");
+        wclrtoeol (stdscr);
 
         /* get the real command */
         if ((op = km_dokey (MENU_MAIN)) == OP_TAG_PREFIX) {
           /* abort tag sequence */
-          CLEARLINE (LINES - 1);
+          CLEARLINE(stdscr, LINES - 1);
           continue;
         }
       }
@@ -635,20 +582,19 @@ int mutt_index_menu (void)
         tag = 1;
 
         /* give visual indication that the next command is a tag- command */
-        mvaddstr (LINES - 1, 0, "tag-");
-        clrtoeol ();
+        mvwaddstr (stdscr, LINES - 1, 0, "tag-");
+        wclrtoeol (stdscr);
 
         /* get the real command */
         if ((op = km_dokey (MENU_MAIN)) == OP_TAG_PREFIX) {
           /* abort tag sequence */
-          CLEARLINE (LINES - 1);
+          CLEARLINE(stdscr, LINES - 1);
           continue;
         }
       }
 
       mutt_clear_error ();
-    }
-    else {
+    } else {
       if (menu->current < menu->max)
         menu->oldcurrent = menu->current;
       else
@@ -657,10 +603,6 @@ int mutt_index_menu (void)
       mutt_curs_set (1);        /* fallback from the pager */
     }
 
-#ifdef USE_NNTP
-    unset_option (OPTNEWS);     /* for any case */
-#endif
-
     switch (op) {
 
       /* ----------------------------------------------------------------------
@@ -710,112 +652,7 @@ int mutt_index_menu (void)
       menu_current_bottom (menu);
       break;
 
-#ifdef USE_NNTP
-    case OP_GET_MESSAGE:
-    case OP_GET_PARENT:
-      CHECK_MSGCOUNT;
-      if (Context->magic == M_NNTP) {
-        HEADER *h;
-
-        if (op == OP_GET_MESSAGE) {
-          buf[0] = 0;
-          if (mutt_get_field (_("Enter Message-ID: "), buf, sizeof (buf), 0)
-              != 0 || !buf[0])
-            break;
-        }
-        else {
-          string_list_t *ref = CURHDR->env->references;
-
-          if (!ref) {
-            mutt_error (_("Article has no parent reference!"));
-
-            break;
-          }
-          m_strcpy(buf, sizeof(buf), ref->data);
-        }
-        if (!Context->id_hash)
-          Context->id_hash = mutt_make_id_hash (Context);
-        if ((h = hash_find (Context->id_hash, buf))) {
-          if (h->virtual != -1) {
-            menu->current = h->virtual;
-            menu->redraw = REDRAW_MOTION_RESYNCH;
-          }
-          else if (h->collapsed) {
-            mutt_uncollapse_thread (Context, h);
-            mutt_set_virtual (Context);
-            menu->current = h->virtual;
-            menu->redraw = REDRAW_MOTION_RESYNCH;
-          }
-          else
-            mutt_error (_("Message not visible in limited view."));
-        }
-        else {
-          if (nntp_check_msgid (Context, buf) == 0) {
-            h = Context->hdrs[Context->msgcount - 1];
-            mutt_sort_headers (Context, 0);
-            menu->current = h->virtual;
-            menu->redraw = REDRAW_FULL;
-          }
-          else
-            mutt_error (_("Article %s not found on server"), buf);
-        }
-      }
-      break;
-
-    case OP_GET_CHILDREN:
-    case OP_RECONSTRUCT_THREAD:
-      CHECK_MSGCOUNT;
-      if (Context->magic == M_NNTP) {
-        HEADER *h;
-        int old = CURHDR->index;
-
-        if (!CURHDR->env->message_id) {
-          mutt_error (_("No Message-ID. Unable to perform operation"));
-
-          break;
-        }
-
-        if (!Context->id_hash)
-          Context->id_hash = mutt_make_id_hash (Context);
-        m_strcpy(buf, sizeof(buf), CURHDR->env->message_id);
-
-        if (op == OP_RECONSTRUCT_THREAD) {
-          string_list_t *ref = CURHDR->env->references;
-
-          while (ref) {
-            nntp_check_msgid (Context, ref->data);
-            /* the last msgid in References is the root message */
-            if (!ref->next)
-              m_strcpy(buf, sizeof(buf), ref->data);
-            ref = ref->next;
-          }
-        }
-        mutt_message (_("Check for children of message..."));
-
-        if (nntp_check_children (Context, buf) == 0) {
-          mutt_sort_headers (Context, (op == OP_RECONSTRUCT_THREAD));
-          h = hash_find (Context->id_hash, buf);
-          /* if the root message was retrieved, move to it */
-          if (h)
-            menu->current = h->virtual;
-          else                  /* try to restore old position */
-            for (i = 0; i < Context->msgcount; i++)
-              if (Context->hdrs[i]->index == old) {
-                menu->current = Context->hdrs[i]->virtual;
-                /* As an added courtesy, recenter the menu
-                 * with the current entry at the middle of the screen */
-                menu_check_recenter (menu);
-                menu_current_middle (menu);
-              }
-        }
-        menu->redraw = REDRAW_FULL;
-        mutt_clear_error ();
-      }
-      break;
-#endif
-
     case OP_JUMP:
-
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
       if (isdigit (LastKey))
@@ -866,7 +703,6 @@ int mutt_index_menu (void)
        */
 
     case OP_MAIN_DELETE_PATTERN:
-
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
       CHECK_READONLY;
@@ -879,14 +715,12 @@ int mutt_index_menu (void)
       break;
 
     case OP_MAIN_FETCH_MAIL:
-
       CHECK_ATTACH;
       pop_fetch_mail ();
       menu->redraw = REDRAW_FULL;
       break;
 
     case OP_HELP:
-
       mutt_help (MENU_MAIN);
       menu->redraw = REDRAW_FULL;
       break;
@@ -907,7 +741,6 @@ int mutt_index_menu (void)
 
     case OP_MAIN_LIMIT:
     case OP_TOGGLE_READ:
-
       CHECK_IN_MAILBOX;
       menu->oldcurrent = (Context->vcount && menu->current >= 0
                           && menu->current <
@@ -955,7 +788,6 @@ int mutt_index_menu (void)
       break;
 
     case OP_QUIT:
-
       closed = op;
       if (attach_msg) {
         done = 1;
@@ -981,8 +813,7 @@ int mutt_index_menu (void)
       break;
 
     case OP_REDRAW:
-
-      clearok (stdscr, TRUE);
+      clearok (main_w, TRUE);
       menu->redraw = REDRAW_FULL;
       break;
 
@@ -990,7 +821,6 @@ int mutt_index_menu (void)
     case OP_SEARCH_REVERSE:
     case OP_SEARCH_NEXT:
     case OP_SEARCH_OPPOSITE:
-
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
       if ((menu->current = mutt_search_command (menu->current, op)) == -1)
@@ -1001,7 +831,6 @@ int mutt_index_menu (void)
 
     case OP_SORT:
     case OP_SORT_REVERSE:
-
       if (mutt_select_sort ((op == OP_SORT_REVERSE)) == 0) {
         if (Context && Context->msgcount) {
           resort_index (menu);
@@ -1011,7 +840,6 @@ int mutt_index_menu (void)
       break;
 
     case OP_TAG:
-
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
       if (tag && !option (OPTAUTOTAG)) {
@@ -1035,7 +863,6 @@ int mutt_index_menu (void)
       break;
 
     case OP_MAIN_TAG_PATTERN:
-
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
       mutt_pattern_func (M_TAG, _("Tag messages matching: "));
@@ -1043,7 +870,6 @@ int mutt_index_menu (void)
       break;
 
     case OP_MAIN_UNDELETE_PATTERN:
-
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
       CHECK_READONLY;
@@ -1056,7 +882,6 @@ int mutt_index_menu (void)
       break;
 
     case OP_MAIN_UNTAG_PATTERN:
-
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
       if (mutt_pattern_func (M_UNTAG, _("Untag messages matching: ")) == 0)
@@ -1073,7 +898,6 @@ int mutt_index_menu (void)
       break;
 
     case OP_MAIN_SYNC_FOLDER:
-
       if (Context && !Context->msgcount)
         break;
 
@@ -1126,15 +950,7 @@ int mutt_index_menu (void)
     case OP_SIDEBAR_OPEN:
     case OP_MAIN_CHANGE_FOLDER:
     case OP_MAIN_CHANGE_FOLDER_READONLY:
-#ifdef USE_NNTP
-    case OP_MAIN_CHANGE_GROUP:
-    case OP_MAIN_CHANGE_GROUP_READONLY:
-#endif
-      if (attach_msg || option (OPTREADONLY) ||
-#ifdef USE_NNTP
-          op == OP_MAIN_CHANGE_GROUP_READONLY ||
-#endif
-          op == OP_MAIN_CHANGE_FOLDER_READONLY)
+      if (attach_msg || op == OP_MAIN_CHANGE_FOLDER_READONLY)
         flags = M_READONLY;
       else
         flags = 0;
@@ -1145,26 +961,10 @@ int mutt_index_menu (void)
         cp = _("Open mailbox");
 
       buf[0] = '\0';
-#ifdef USE_NNTP
-      unset_option (OPTNEWS);
-      if (op == OP_MAIN_CHANGE_GROUP || op == OP_MAIN_CHANGE_GROUP_READONLY) {
-        set_option (OPTNEWS);
-        if (!(CurrentNewsSrv = mutt_select_newsserver (NewsServer)))
-          break;
-        if (flags)
-          cp = _("Open newsgroup in read-only mode");
-        else
-          cp = _("Open newsgroup");
-        nntp_buffy (buf, sizeof (buf));
-      }
-      else
-#endif
-      {
-        if (Context && Context->path)
-          m_strcpy(buf, sizeof(buf), Context->path);
-        if (op != OP_SIDEBAR_OPEN)
-          buffy_next (buf, sizeof (buf));
-      }
+      if (Context && Context->path)
+        m_strcpy(buf, sizeof(buf), Context->path);
+      if (op != OP_SIDEBAR_OPEN)
+        buffy_next (buf, sizeof (buf));
 
       if (op == OP_SIDEBAR_OPEN) {
         m_strcpy(buf, sizeof(buf), sidebar_get_current());
@@ -1177,18 +977,11 @@ int mutt_index_menu (void)
           break;
       }
       if (!buf[0]) {
-        CLEARLINE (LINES - 1);
+        CLEARLINE(main_w, LINES - 1);
         break;
       }
 
-#ifdef USE_NNTP
-      if (option (OPTNEWS)) {
-        unset_option (OPTNEWS);
-        nntp_expand_path (buf, sizeof (buf), &CurrentNewsSrv->conn->account);
-      }
-      else
-#endif
-        mutt_expand_path (buf, sizeof (buf));
+      mutt_expand_path (buf, sizeof (buf));
       if (mx_get_magic (buf) <= 0) {
         mutt_error (_("%s is not a mailbox."), buf);
         break;
@@ -1232,14 +1025,6 @@ int mutt_index_menu (void)
         menu->current = 0;
       sidebar_set_current (buf);
 
-#ifdef USE_NNTP
-      /* buffy_check() must be done with mail-reader mode! */
-      menu->help = mutt_compile_help (helpstr, sizeof (helpstr), MENU_MAIN,
-                                      (Context
-                                       && (Context->magic ==
-                                           M_NNTP)) ? IndexNewsHelp :
-                                      IndexHelp);
-#endif
       mutt_clear_error ();
       buffy_check (0);     /* force the buffy check after we have changed
                                    the folder */
@@ -1281,7 +1066,6 @@ int mutt_index_menu (void)
       continue;
 
     case OP_EXIT:
-
       closed = op;
       if (menu->menu == MENU_MAIN && attach_msg) {
         done = 1;
@@ -1301,7 +1085,6 @@ int mutt_index_menu (void)
       break;
 
     case OP_EDIT_TYPE:
-
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
       CHECK_ATTACH;
@@ -1316,7 +1099,6 @@ int mutt_index_menu (void)
       break;
 
     case OP_MAIN_BREAK_THREAD:
-
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
       CHECK_READONLY;
@@ -1346,7 +1128,6 @@ int mutt_index_menu (void)
       break;
 
     case OP_MAIN_LINK_THREADS:
-
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
       CHECK_READONLY;
@@ -1384,7 +1165,6 @@ int mutt_index_menu (void)
       break;
 
     case OP_MAIN_NEXT_UNDELETED:
-
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
       if (menu->current >= Context->vcount - 1) {
@@ -1407,7 +1187,6 @@ int mutt_index_menu (void)
       break;
 
     case OP_NEXT_ENTRY:
-
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
       if (menu->current >= Context->vcount - 1) {
@@ -1426,7 +1205,6 @@ int mutt_index_menu (void)
       break;
 
     case OP_MAIN_PREV_UNDELETED:
-
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
       if (menu->current < 1) {
@@ -1448,7 +1226,6 @@ int mutt_index_menu (void)
       break;
 
     case OP_PREV_ENTRY:
-
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
       if (menu->current < 1) {
@@ -1507,7 +1284,6 @@ int mutt_index_menu (void)
     case OP_MAIN_PREV_UNREAD:
     case OP_MAIN_NEXT_NEW_THEN_UNREAD:
     case OP_MAIN_PREV_NEW_THEN_UNREAD:
-
       {
         int first_unread = -1;
         int first_new = -1;
@@ -1589,7 +1365,6 @@ int mutt_index_menu (void)
         break;
       }
     case OP_FLAG_MESSAGE:
-
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
       CHECK_READONLY;
@@ -1622,7 +1397,6 @@ int mutt_index_menu (void)
       break;
 
     case OP_TOGGLE_NEW:
-
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
       CHECK_READONLY;
@@ -1664,7 +1438,6 @@ int mutt_index_menu (void)
       break;
 
     case OP_TOGGLE_WRITE:
-
       CHECK_IN_MAILBOX;
       if (mx_toggle_write (Context) == 0)
         menu->redraw |= REDRAW_STATUS;
@@ -1674,7 +1447,6 @@ int mutt_index_menu (void)
     case OP_MAIN_NEXT_SUBTHREAD:
     case OP_MAIN_PREV_THREAD:
     case OP_MAIN_PREV_SUBTHREAD:
-
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
       switch (op) {
@@ -1712,7 +1484,6 @@ int mutt_index_menu (void)
       break;
 
     case OP_MAIN_PARENT_MESSAGE:
-
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
 
@@ -1729,7 +1500,6 @@ int mutt_index_menu (void)
 
     case OP_MAIN_SET_FLAG:
     case OP_MAIN_CLEAR_FLAG:
-
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
       CHECK_READONLY;
@@ -1838,7 +1608,6 @@ int mutt_index_menu (void)
        */
 
     case OP_BOUNCE_MESSAGE:
-
       CHECK_ATTACH;
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
@@ -1846,7 +1615,6 @@ int mutt_index_menu (void)
       break;
 
     case OP_CREATE_ALIAS:
-
       mutt_create_alias (Context
                          && Context->vcount ? CURHDR->env : NULL, NULL);
       MAYBE_REDRAW (menu->redraw);
@@ -1861,7 +1629,6 @@ int mutt_index_menu (void)
 
     case OP_PURGE_MESSAGE:
     case OP_DELETE:
-
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
       CHECK_READONLY;
@@ -1901,7 +1668,6 @@ int mutt_index_menu (void)
 
     case OP_DELETE_THREAD:
     case OP_DELETE_SUBTHREAD:
-
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
       CHECK_READONLY;
@@ -1922,25 +1688,13 @@ int mutt_index_menu (void)
       }
       break;
 
-#ifdef USE_NNTP
-    case OP_CATCHUP:
-      if (Context && Context->magic == M_NNTP) {
-        if (mutt_newsgroup_catchup (CurrentNewsSrv,
-                                    ((nntp_data_t *) Context->data)->group))
-          menu->redraw = REDRAW_INDEX | REDRAW_STATUS;
-      }
-      break;
-#endif
-
     case OP_DISPLAY_ADDRESS:
-
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
       mutt_display_address (CURHDR->env);
       break;
 
     case OP_ENTER_COMMAND:
-
       CurrentMenu = MENU_MAIN;
       mutt_enter_command ();
       mutt_check_rescore (Context);
@@ -1951,7 +1705,6 @@ int mutt_index_menu (void)
       break;
 
     case OP_EDIT_MESSAGE:
-
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
       CHECK_READONLY;
@@ -1967,7 +1720,6 @@ int mutt_index_menu (void)
       break;
 
     case OP_FORWARD_MESSAGE:
-
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
       CHECK_ATTACH;
@@ -1979,7 +1731,6 @@ int mutt_index_menu (void)
       break;
 
     case OP_GROUP_REPLY:
-
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
       CHECK_ATTACH;
@@ -1993,7 +1744,6 @@ int mutt_index_menu (void)
       break;
 
     case OP_LIST_REPLY:
-
       CHECK_ATTACH;
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
@@ -2007,7 +1757,6 @@ int mutt_index_menu (void)
       break;
 
     case OP_MAIL:
-
       CHECK_ATTACH;
       ci_send_message (0, NULL, NULL, Context, NULL);
       menu->redraw = REDRAW_FULL;
@@ -2069,14 +1818,12 @@ int mutt_index_menu (void)
       break;
 
     case OP_RECALL_MESSAGE:
-
       CHECK_ATTACH;
       ci_send_message (SENDPOSTPONED, NULL, NULL, Context, NULL);
       menu->redraw = REDRAW_FULL;
       break;
 
     case OP_RESEND:
-
       CHECK_ATTACH;
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
@@ -2094,47 +1841,7 @@ int mutt_index_menu (void)
       menu->redraw = REDRAW_FULL;
       break;
 
-#ifdef USE_NNTP
-    case OP_POST:
-    case OP_FOLLOWUP:
-    case OP_FORWARD_TO_GROUP:
-
-      CHECK_ATTACH;
-      if ((op == OP_FOLLOWUP || op == OP_FORWARD_TO_GROUP) &&
-          Context && Context->msgcount == 0) {
-        mutt_error (_("There are no messages."));
-        sleep (2);
-      }
-      else if (op != OP_FOLLOWUP || !CURHDR->env->followup_to ||
-               m_strcasecmp(CURHDR->env->followup_to, "poster") ||
-               query_quadoption (OPT_FOLLOWUPTOPOSTER,
-                                 _("Reply by mail as poster prefers?")) !=
-               M_YES) {
-        if (Context && Context->magic == M_NNTP
-            && !((nntp_data_t *) Context->data)->allowed
-            && query_quadoption (OPT_TOMODERATED,
-                                 _
-                                 ("Posting to this group not allowed, may be moderated. Continue?"))
-            != M_YES)
-          break;
-        if (op == OP_POST)
-          ci_send_message (SENDNEWS, NULL, NULL, Context, NULL);
-        else {
-          CHECK_MSGCOUNT;
-          if (op == OP_FOLLOWUP)
-            ci_send_message (SENDNEWS | SENDREPLY, NULL, NULL, Context,
-                             tag ? NULL : CURHDR);
-          else
-            ci_send_message (SENDNEWS | SENDFORWARD, NULL, NULL, Context,
-                             tag ? NULL : CURHDR);
-        }
-        menu->redraw = REDRAW_FULL;
-        break;
-      }
-#endif
-
     case OP_REPLY:
-
       CHECK_ATTACH;
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
@@ -2147,14 +1854,12 @@ int mutt_index_menu (void)
       break;
 
     case OP_SHELL_ESCAPE:
-
       mutt_shell_escape ();
       MAYBE_REDRAW (menu->redraw);
       break;
 
     case OP_TAG_THREAD:
     case OP_TAG_SUBTHREAD:
-
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
       rc = mutt_thread_set_flag (CURHDR, M_TAG, !CURHDR->tagged,
@@ -2172,7 +1877,6 @@ int mutt_index_menu (void)
       break;
 
     case OP_UNDELETE:
-
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
       CHECK_READONLY;
@@ -2199,7 +1903,6 @@ int mutt_index_menu (void)
 
     case OP_UNDELETE_THREAD:
     case OP_UNDELETE_SUBTHREAD:
-
       CHECK_MSGCOUNT;
       CHECK_VISIBLE;
       CHECK_READONLY;
@@ -2225,10 +1928,6 @@ int mutt_index_menu (void)
       }
       break;
 
-    case OP_VERSION:
-      mutt_version ();
-      break;
-
     case OP_BUFFY_LIST:
       if (option (OPTFORCEBUFFYCHECK))
         buffy_check (1);
@@ -2248,10 +1947,6 @@ int mutt_index_menu (void)
     case OP_END_COND:
       break;
 
-    case OP_WHAT_KEY:
-      mutt_what_key ();
-      break;
-
     case OP_SIDEBAR_SCROLL_UP:
     case OP_SIDEBAR_SCROLL_DOWN:
     case OP_SIDEBAR_NEXT:
@@ -2260,6 +1955,7 @@ int mutt_index_menu (void)
     case OP_SIDEBAR_PREV_NEW:
       sidebar_scroll (op);
       break;
+
     default:
       if (menu->menu == MENU_MAIN)
         km_error_key (MENU_MAIN);
@@ -2277,10 +1973,6 @@ int mutt_index_menu (void)
   if (!attach_msg) {
   /* Close all open IMAP connections */
     imap_logout_all ();
-#ifdef USE_NNTP
-  /* Close all open NNTP connections */
-    nntp_logout_all ();
-#endif
   }
 
   mutt_menuDestroy (&menu);