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

diff --git a/remailer.c b/remailer.c
index 4722c1a..9acc858 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,