* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
*/
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include "mutt.h"
#include "mutt_curses.h"
#include "mutt_regex.h"
unsigned char *fmt, size_t blen, int *buf_ready)
{
unsigned char *p;
- static int b_read;
+ static int b_read = 0;
if (*buf_ready == 0)
{
wchar_t wc;
mbstate_t mbstate;
- int wrap_cols = COLS - WrapMargin - SidebarWidth;
-
+ int wrap_cols = COLS;
+ if (!(flags & (M_SHOWFLAT)))
+ wrap_cols -= WrapMargin;
+ wrap_cols -= SidebarWidth;
+
if (wrap_cols <= 0)
wrap_cols = COLS;
CLEARLINE_WIN(statusoffset);
if (IsHeader (extra))
{
- _mutt_make_string (buffer,
- COLS-9-SidebarWidth < sizeof (buffer) ?
- COLS-9-SidebarWidth : sizeof (buffer),
- NONULL (PagerFmt), Context, extra->hdr, M_FORMAT_MAKEPRINT);
+ size_t l1 = (COLS - 9) * MB_LEN_MAX;
+ size_t l2 = sizeof (buffer);
+ _mutt_make_string (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt),
+ Context, extra->hdr, M_FORMAT_MAKEPRINT);
}
else if (IsMsgAttach (extra))
{
- _mutt_make_string (buffer,
- COLS - 9 - SidebarWidth < sizeof (buffer) ?
- COLS - 9 - SidebarWidth : sizeof (buffer),
- NONULL (PagerFmt), Context, extra->bdy->hdr, M_FORMAT_MAKEPRINT);
+ size_t l1 = (COLS - 9) * MB_LEN_MAX;
+ size_t l2 = sizeof (buffer);
+ _mutt_make_string (buffer, l1 < l2 ? l1 : l2, NONULL (PagerFmt),
+ Context, extra->bdy->hdr, M_FORMAT_MAKEPRINT);
}
mutt_paddstr (COLS-10-SidebarWidth, IsHeader (extra) || IsMsgAttach (extra) ?
buffer : banner);