Changeset 5137:0c47f7b06158 for status.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:

• status.c (modified) (3 diffs)

status.c

@@ -40 +40 @@
   return buf;
 }
+
+static void _menu_status_line (char *buf, size_t buflen, size_t col, MUTTMENU *menu, const char *p);
 
 /* %b = number of incoming folders with unread messages [option]
@@ -59 +61 @@
  * %V = currently active limit pattern [option] */
 static const char *
-status_format_str (char *buf, size_t buflen, char op, const char *src,
+status_format_str (char *buf, size_t buflen, size_t col, char op, const char *src,
                    const char *prefix, const char *ifstring,
                    const char *elsestring,
@@ -287 +289 @@
 
   if (optional)
-    menu_status_line (buf, buflen, menu, ifstring);
+    _menu_status_line (buf, buflen, col, menu, ifstring);
   else if (flags & M_FORMAT_OPTIONAL)
-    menu_status_line (buf, buflen, menu, elsestring);
+    _menu_status_line (buf, buflen, col, menu, elsestring);
 
   return (src);
 }
 
+static void _menu_status_line (char *buf, size_t buflen, size_t col, MUTTMENU *menu, const char *p)
+{
+  mutt_FormatString (buf, buflen, col, p, status_format_str, (unsigned long) menu, 0);
+}
+
 void menu_status_line (char *buf, size_t buflen, MUTTMENU *menu, const char *p)
 {
-  mutt_FormatString (buf, buflen, p, status_format_str, (unsigned long) menu, 0);
+  mutt_FormatString (buf, buflen, 0, p, status_format_str, (unsigned long) menu, 0);
 }