X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=compose.c;h=7e74f619119bc170054dddc57767f1a609354fc9;hp=52907b60b28fe058dda217f27118c75067e86ccf;hb=25594eeaad2af2d06328b47283cfba72fa3bc8cd;hpb=8a2967d883cee12f0de4c0cdf0cd594ea96e622b

diff --git a/compose.c b/compose.c
index 52907b6..7e74f61 100644
--- a/compose.c
+++ b/compose.c
@@ -113,9 +113,7 @@ static struct mapping_t ComposeNewsHelp[] = {
 
 
 static void snd_entry (char *b, ssize_t blen, MUTTMENU * menu, int num) {
-  int w = MIN(COLS-SW, blen);
-
-  m_strformat(b, w, AttachFormat, mutt_attach_fmt,
+  m_strformat(b, blen, COLS - SW, AttachFormat, mutt_attach_fmt,
               ((ATTACHPTR **)menu->data)[num],
               M_FORMAT_STAT_FILE | (option(OPTARROWCURSOR) ? M_FORMAT_ARROWCURSOR : 0));
 }
@@ -450,10 +448,8 @@ static const char *compose_format_str (char *buf, ssize_t buflen, char op,
     break;
   }
 
-  if (optional)
-    compose_status_line (buf, buflen, menu, ifstr);
-  else if (flags & M_FORMAT_OPTIONAL)
-    compose_status_line (buf, buflen, menu, elstr);
+  if (flags & M_FORMAT_OPTIONAL)
+    compose_status_line(buf, buflen, menu, optional ? ifstr : elstr);
 
   return (src);
 }
@@ -461,8 +457,7 @@ static const char *compose_format_str (char *buf, ssize_t buflen, char op,
 static void compose_status_line (char *buf, ssize_t buflen, MUTTMENU * menu,
                                  const char *p)
 {
-    int w = MIN(COLS - SW, buflen);
-    m_strformat(buf, w, p, compose_format_str, menu, 0);
+    m_strformat(buf, buflen, COLS - SW, p, compose_format_str, menu, 0);
 }
 
 /* return values: