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

• compose.c (modified) (5 diffs)

compose.c

@@ -100 +100 @@
 static void snd_entry (char *b, size_t blen, MUTTMENU *menu, int num)
 {
-    mutt_FormatString (b, blen, NONULL (AttachFormat), mutt_attach_fmt,
+    mutt_FormatString (b, blen, 0, NONULL (AttachFormat), mutt_attach_fmt,
             (unsigned long)(((ATTACHPTR **) menu->data)[num]),
             M_FORMAT_STAT_FILE | M_FORMAT_ARROWCURSOR);
@@ -407 +407 @@
 
 /* prototype for use below */
-static void compose_status_line (char *buf, size_t buflen, MUTTMENU *menu, 
+static void compose_status_line (char *buf, size_t buflen, size_t col, MUTTMENU *menu, 
       const char *p);
 
@@ -423 +423 @@
 
 static const char *
-compose_format_str (char *buf, size_t buflen, char op, const char *src,
+compose_format_str (char *buf, size_t buflen, size_t col, char op, const char *src,
                    const char *prefix, const char *ifstring,
                    const char *elsestring,
@@ -466 +466 @@
 
   if (optional)
-    compose_status_line (buf, buflen, menu, ifstring);
+    compose_status_line (buf, buflen, col, menu, ifstring);
   else if (flags & M_FORMAT_OPTIONAL)
-    compose_status_line (buf, buflen, menu, elsestring);
+    compose_status_line (buf, buflen, col, menu, elsestring);
 
   return (src);
 }
 
-static void compose_status_line (char *buf, size_t buflen, MUTTMENU *menu, 
+static void compose_status_line (char *buf, size_t buflen, size_t col, MUTTMENU *menu, 
       const char *p)
 {
-  mutt_FormatString (buf, buflen, p, compose_format_str, 
+  mutt_FormatString (buf, buflen, col, p, compose_format_str, 
         (unsigned long) menu, 0);
 }
@@ -1276 +1276 @@
     if (menu->redraw & REDRAW_STATUS) 
     {
-        compose_status_line (buf, sizeof (buf), menu, NONULL(ComposeFormat));
+        compose_status_line (buf, sizeof (buf), 0, menu, NONULL(ComposeFormat));
         CLEARLINE (option (OPTSTATUSONTOP) ? 0 : LINES-2);
         SETCOLOR (MT_COLOR_STATUS);