projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Andreas Krennmair:
[apps/madmutt.git]
/
muttlib.c
diff --git
a/muttlib.c
b/muttlib.c
index
6e95088
..
4beb99c
100644
(file)
--- a/
muttlib.c
+++ b/
muttlib.c
@@
-1029,7
+1029,7
@@
void mutt_FormatString (char *dest, /* output buffer */
if ( DrawFullLine )
count = (COLS < destlen ? COLS : destlen);
else
if ( DrawFullLine )
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 */
if (count > col)
{
count -= col; /* how many columns left on this line */
@@
-1042,8
+1042,10
@@
void mutt_FormatString (char *dest, /* output buffer */
wptr += count;
col += count;
}
wptr += count;
col += count;
}
- if (
len
+ wlen > destlen)
+ if (
wid
+ wlen > destlen)
len = destlen - wlen;
len = destlen - wlen;
+ else
+ len = wid;
memcpy (wptr, buf, len);
wptr += len;
wlen += len;
memcpy (wptr, buf, len);
wptr += len;
wlen += len;
@@
-1469,7
+1471,7
@@
time_t mutt_decrease_mtime (const char *f, struct stat *st)
const char *mutt_make_version (void)
{
static char vstring[STRING];
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;
}
MUTT_VERSION, ReleaseDate);
return vstring;
}