X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=remailer.c;h=137e5a40089230ca312d989d0ce306b1584cb2a8;hp=4722c1a763e83ed679176dc948829efe88dabb00;hb=43ff595b82123a6f606b4ae6d0c27968f5916386;hpb=38dacbf03fe1a0daa9ce426caaef5582b90006b2

diff --git a/remailer.c b/remailer.c
index 4722c1a..137e5a4 100644
--- a/remailer.c
+++ b/remailer.c
@@ -383,10 +383,9 @@ mix_entry_fmt (char *dest, ssize_t destlen, char op, const char *src,
         *dest = '\0';
     }
 
-    if (optional)
-        m_strformat (dest, destlen, ifstr, mutt_attach_fmt, data, 0);
-    else if (flags & M_FORMAT_OPTIONAL)
-        m_strformat (dest, destlen, elstr, mutt_attach_fmt, data, 0);
+    if (flags & M_FORMAT_OPTIONAL)
+        m_strformat(dest, destlen, 0, optional ? ifstr : elstr,
+                    mutt_attach_fmt, data, 0);
     return (src);
 }
 
@@ -395,11 +394,9 @@ mix_entry_fmt (char *dest, ssize_t destlen, char op, const char *src,
 static void mix_entry (char *b, ssize_t blen, MUTTMENU * menu, int num)
 {
     remailer_t **type2_list = (remailer_t **) menu->data;
-    int w = (COLS-SW) > blen ? blen : (COLS-SW);
 
-    m_strformat(b, w, NONULL (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,
@@ -430,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;
@@ -454,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;
 
@@ -490,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;