Show
Ignore:
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:
1 modified

Legend:

Unmodified
Added
Removed

  • recvattach.c

    r5010 r5137  
    174174const char *mutt_attach_fmt (char *dest, 
    175175    size_t destlen, 
     176    size_t col, 
    176177    char op, 
    177178    const char *src, 
    … …  
    357358   
    358359  if (optional) 
    359     mutt_FormatString (dest, destlen, ifstring, mutt_attach_fmt, data, 0); 
     360    mutt_FormatString (dest, destlen, col, ifstring, mutt_attach_fmt, data, 0); 
    360361  else if (flags & M_FORMAT_OPTIONAL) 
    361     mutt_FormatString (dest, destlen, elsestring, mutt_attach_fmt, data, 0); 
     362    mutt_FormatString (dest, destlen, col, elsestring, mutt_attach_fmt, data, 0); 
    362363  return (src); 
    363364} 
    … …  
    365366void attach_entry (char *b, size_t blen, MUTTMENU *menu, int num) 
    366367{ 
    367   mutt_FormatString (b, blen, NONULL (AttachFormat), mutt_attach_fmt, (unsigned long) (((ATTACHPTR **)menu->data)[num]), M_FORMAT_ARROWCURSOR); 
     368  mutt_FormatString (b, blen, 0, NONULL (AttachFormat), mutt_attach_fmt, (unsigned long) (((ATTACHPTR **)menu->data)[num]), M_FORMAT_ARROWCURSOR); 
    368369} 
    369370