Changeset 5137:0c47f7b06158 for pgpkey.c

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

  • pgpkey.c

    r5010 r5137  
    122122static const char *pgp_entry_fmt (char *dest, 
    123123                                  size_t destlen, 
     124                                  size_t col, 
    124125                                  char op, 
    125126                                  const char *src, 
    … …  
    278279 
    279280  if (optional) 
    280     mutt_FormatString (dest, destlen, ifstring, mutt_attach_fmt, data, 0); 
     281    mutt_FormatString (dest, destlen, col, ifstring, mutt_attach_fmt, data, 0); 
    281282  else if (flags & M_FORMAT_OPTIONAL) 
    282     mutt_FormatString (dest, destlen, elsestring, mutt_attach_fmt, data, 0); 
     283    mutt_FormatString (dest, destlen, col, elsestring, mutt_attach_fmt, data, 0); 
    283284  return (src); 
    284285} 
    … …  
    292293  entry.num = num + 1; 
    293294 
    294   mutt_FormatString (s, l, NONULL (PgpEntryFormat), pgp_entry_fmt,  
     295  mutt_FormatString (s, l, 0, NONULL (PgpEntryFormat), pgp_entry_fmt,  
    295296                     (unsigned long) &entry, M_FORMAT_ARROWCURSOR); 
    296297}