X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=lib-ui%2Fhdrline.c;h=92e6fa628254cb96a8c0c900b56563f248668430;hp=cb5a5f400c2a3ea7db71c944927ea4fdea5dc2ce;hb=7d29626ce4e1fa932c6349c7253e6f774df069fc;hpb=6896715a0d62173a620b2377dba8e6d2058c1ee2

diff --git a/lib-ui/hdrline.c b/lib-ui/hdrline.c
index cb5a5f4..92e6fa6 100644
--- a/lib-ui/hdrline.c
+++ b/lib-ui/hdrline.c
@@ -210,14 +210,11 @@ struct hdr_format_info {
   HEADER *hdr;
 };
 
-static const char *hdr_format_str (char *dest,
-                                   ssize_t destlen,
-                                   char op,
-                                   const char *src,
-                                   const char *prefix,
-                                   const char *ifstr,
-                                   const char *elstr,
-                                   anytype data, format_flag flags)
+static const char *
+hdr_format_str(char *dest, ssize_t destlen,
+               char op, const char *src, const char *prefix,
+               const char *ifstr, const char *elstr,
+               anytype data, format_flag flags)
 {
   struct hdr_format_info *hfi = data.ptr;
   HEADER *hdr, *htmp;
@@ -706,12 +703,11 @@ static const char *hdr_format_str (char *dest,
     break;
   }
 
-  if (optional)
-    m_strformat(dest, destlen, ifstr, hdr_format_str, data, flags);
-  else if (flags & M_FORMAT_OPTIONAL)
-    m_strformat(dest, destlen, elstr, hdr_format_str, data, flags);
+  if (flags & M_FORMAT_OPTIONAL)
+    m_strformat(dest, destlen, 0, optional ? ifstr: elstr,
+                hdr_format_str, data, flags);
 
-  return (src);
+  return src;
 #undef THREAD_NEW
 #undef THREAD_OLD
 }
@@ -725,5 +721,5 @@ _mutt_make_string (char *dest, ssize_t destlen, const char *s, CONTEXT * ctx,
   hfi.hdr = hdr;
   hfi.ctx = ctx;
 
-  m_strformat(dest, destlen, s, hdr_format_str, &hfi, flags);
+  m_strformat(dest, destlen, COLS - SW, s, hdr_format_str, &hfi, flags);
 }