Let ncurses deal with that properly.

[apps/madmutt.git] / remailer.c

diff --git a/remailer.c b/remailer.c
index a261f1b..137e5a4 100644 (file)
--- a/remailer.c
+++ b/remailer.c
@@ -384,8 +384,8 @@ mix_entry_fmt (char *dest, ssize_t destlen, char op, const char *src,
     }
 
     if (flags & M_FORMAT_OPTIONAL)
-        m_strformat (dest, destlen, optional ? ifstr : elstr,
-                     mutt_attach_fmt, data, 0);
+        m_strformat(dest, destlen, 0, optional ? ifstr : elstr,
+                    mutt_attach_fmt, data, 0);
     return (src);
 }
 
@@ -395,9 +395,8 @@ static void mix_entry (char *b, ssize_t blen, MUTTMENU * menu, int num)
 {
     remailer_t **type2_list = (remailer_t **) menu->data;
 
-    int w = MIN(COLS - SW, blen);
-    m_strformat(b, w, MixEntryFormat, mix_entry_fmt, type2_list[num],
-                option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0);
+    m_strformat(b, blen, COLS - SW, MixEntryFormat, mix_entry_fmt,
+                type2_list[num], 0);
 }
 
 static int mix_chain_add (mixchain_t * chain, const char *s,
@@ -428,16 +427,6 @@ static int mix_chain_add (mixchain_t * chain, const char *s,
     return 0;
 }
 
-static struct mapping_t RemailerHelp[] = {
-    {N_("Append"), OP_MIX_APPEND},
-    {N_("Insert"), OP_MIX_INSERT},
-    {N_("Delete"), OP_MIX_DELETE},
-    {N_("Abort"), OP_EXIT},
-    {N_("OK"), OP_MIX_USE},
-    {NULL, OP_NULL}
-};
-
-
 void mix_make_chain (string_list_t ** chainp, int *redraw)
 {
     string_list_t *p;
@@ -452,7 +441,6 @@ void mix_make_chain (string_list_t ** chainp, int *redraw)
     struct coord *coords = NULL;
 
     MUTTMENU *menu;
-    char helpstr[STRING];
     short loop = 1;
     int op;
 
@@ -488,8 +476,6 @@ void mix_make_chain (string_list_t ** chainp, int *redraw)
     menu->tag = NULL;
     menu->title = _("Select a remailer chain.");
     menu->data = type2_list;
-    menu->help =
-        mutt_compile_help (helpstr, sizeof (helpstr), MENU_MIX, RemailerHelp);
 
     m_len = menu->pagelen = MIX_VOFFSET - menu->offset - 1;