Changeset 5137:0c47f7b06158 for hdrline.c

Timestamp:

2007-04-11 22:36:24 (21 months ago)

Author:

Michael Elkins <me@…>

Branch:

HEAD

Message:

Pass column value recursively when expanding format strings (bug #2840).

Files:

• hdrline.c (modified) (3 diffs)

hdrline.c

@@ -237 +237 @@
 hdr_format_str (char *dest,
                 size_t destlen,
+                size_t col,
                 char op,
                 const char *src,
@@ -716 +717 @@
 
   if (optional)
-    mutt_FormatString (dest, destlen, ifstring, hdr_format_str, (unsigned long) hfi, flags);
+    mutt_FormatString (dest, destlen, col, ifstring, hdr_format_str, (unsigned long) hfi, flags);
   else if (flags & M_FORMAT_OPTIONAL)
-    mutt_FormatString (dest, destlen, elsestring, hdr_format_str, (unsigned long) hfi, flags);
+    mutt_FormatString (dest, destlen, col, elsestring, hdr_format_str, (unsigned long) hfi, flags);
 
   return (src);
@@ -733 +734 @@
   hfi.ctx = ctx;
 
-  mutt_FormatString (dest, destlen, s, hdr_format_str, (unsigned long) &hfi, flags);
-}
+  mutt_FormatString (dest, destlen, 0, s, hdr_format_str, (unsigned long) &hfi, flags);
+}