ch = *src++; /* pad char */
/* calculate space left on line. if we've already written more data
than will fit on the line, ignore the rest of the line */
- if ( DrawFullLine )
+ if ( DrawFullLine || option(OPTSTATUSONTOP))
count = (COLS < destlen ? COLS : destlen);
else
- count = ((COLS-SidebarWidth) < destlen ? COLS - SidebarWidth : destlen);
+ count = ((COLS-SidebarWidth) < destlen ? (COLS - SidebarWidth) : 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;
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;
}