if ( DrawFullLine )
count = (COLS < destlen ? COLS : destlen);
else
- count = ((COLS-SidebarWidth) < destlen ? COLS - SidebarWidth : destlen);
+ count = ((COLS) < destlen ? (COLS) : destlen);
if (count > col)
{
count -= col; /* how many columns left on this line */
wptr += count;
col += count;
}
- if (len + wlen > destlen)
+ if (wid + wlen > destlen)
len = destlen - wlen;
+ else
+ len = wid;
memcpy (wptr, buf, len);
wptr += len;
wlen += len;
void state_mark_attach (STATE *s)
{
if ((s->flags & M_DISPLAY) && !mutt_strcmp (Pager, "builtin"))
- state_puts (AttachmentMarker, s);
+ //state_puts (AttachmentMarker, s);
+ ;
}
void state_attach_puts (const char *t, STATE *s)
const char *mutt_make_version (void)
{
static char vstring[STRING];
- snprintf (vstring, sizeof (vstring), "Mutt %s (%s)",
+ snprintf (vstring, sizeof (vstring), "Mutt-ng %s (%s)",
MUTT_VERSION, ReleaseDate);
return vstring;
}