Changeset 5137:0c47f7b06158 for browser.c

Timestamp:

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

Author:

Michael Elkins <me@…>

Branch:

HEAD

Message:

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

Files:

• browser.c (modified) (3 diffs)

browser.c

@@ -142 +142 @@
 
 static const char *
-folder_format_str (char *dest, size_t destlen, char op, const char *src,
+folder_format_str (char *dest, size_t destlen, size_t col, char op, const char *src,
                    const char *fmt, const char *ifstring, const char *elsestring,
                    unsigned long data, format_flag flags)
@@ -301 +301 @@
 
   if (optional)
-    mutt_FormatString (dest, destlen, ifstring, folder_format_str, data, 0);
+    mutt_FormatString (dest, destlen, col, ifstring, folder_format_str, data, 0);
   else if (flags & M_FORMAT_OPTIONAL)
-    mutt_FormatString (dest, destlen, elsestring, folder_format_str, data, 0);
+    mutt_FormatString (dest, destlen, col, elsestring, folder_format_str, data, 0);
 
   return (src);
@@ -484 +484 @@
   folder.num = num;
   
-  mutt_FormatString (s, slen, NONULL(FolderFormat), folder_format_str, 
+  mutt_FormatString (s, slen, 0, NONULL(FolderFormat), folder_format_str, 
       (unsigned long) &folder, M_FORMAT_ARROWCURSOR);
 }