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

  • pgpinvoke.c

    r4343 r5137  
    5959const char *_mutt_fmt_pgp_command (char *dest, 
    6060                                   size_t destlen, 
     61                                   size_t col, 
    6162                                   char op, 
    6263                                   const char *src, 
    … …  
    140141 
    141142  if (optional) 
    142     mutt_FormatString (dest, destlen, ifstring, _mutt_fmt_pgp_command, data, 0); 
     143    mutt_FormatString (dest, destlen, col, ifstring, _mutt_fmt_pgp_command, data, 0); 
    143144  else if (flags & M_FORMAT_OPTIONAL) 
    144     mutt_FormatString (dest, destlen, elsestring, _mutt_fmt_pgp_command, data, 0); 
     145    mutt_FormatString (dest, destlen, col, elsestring, _mutt_fmt_pgp_command, data, 0); 
    145146 
    146147  return (src); 
    … …  
    149150void mutt_pgp_command (char *d, size_t dlen, struct pgp_command_context *cctx, const char *fmt) 
    150151{ 
    151   mutt_FormatString (d, dlen, NONULL (fmt), _mutt_fmt_pgp_command, (unsigned long) cctx, 0); 
     152  mutt_FormatString (d, dlen, 0, NONULL (fmt), _mutt_fmt_pgp_command, (unsigned long) cctx, 0); 
    152153  dprint (2, (debugfile, "mutt_pgp_command: %s\n", d)); 
    153154}