if (!bufi) {
if (cd != MUTT_ICONV_ERROR) {
ob = bufo, obl = sizeof (bufo);
- my_iconv(cd, 0, 0, &ob, &obl);
+ mutt_iconv(cd, 0, 0, &ob, &obl);
if (ob != bufo)
state_prefix_put (bufo, ob - bufo, s);
}
ib = bufi, ibl = *l;
for (;;) {
ob = bufo, obl = sizeof (bufo);
- mutt_iconv (cd, &ib, &ibl, &ob, &obl, 0, "?");
+ mutt_iconv (cd, &ib, &ibl, &ob, &obl);
if (ob == bufo)
break;
state_prefix_put (bufo, ob - bufo, s);
Quotebuf[i++] = c;
Quotebuf[i] = '\0';
if (i == sizeof (Quotebuf) - 1 || c == '\n') {
- char buf[2 * SHORT_STRING];
+ char buf[2 * STRING];
int j = 0, offset = 0;
regmatch_t pmatch[1];
void state_mark_attach (STATE * s)
{
- if ((s->flags & M_DISPLAY) && !m_strcmp(Pager, "builtin"))
+ if (s->flags & M_DISPLAY)
state_puts (AttachmentMarker, s);
}