#include "lib/intl.h"
#include "lib/str.h"
#include "lib/rx.h"
+#include "lib/debug.h"
#include <sys/stat.h>
#include <ctype.h>
else if (check_attachment_marker ((char *) raw) == 0)
lineInfo[n].type = MT_COLOR_ATTACHMENT;
#endif
- else if (safe_strcmp ("-- \n", buf) == 0
- || safe_strcmp ("-- \r\n", buf) == 0) {
+ else if (mutt_strcmp ("-- \n", buf) == 0
+ || mutt_strcmp ("-- \r\n", buf) == 0) {
i = n + 1;
lineInfo[n].type = MT_COLOR_SIGNATURE;
}
else if (*p == '\033' && *(p + 1) == ']'
&& check_attachment_marker ((char *) p) == 0) {
- dprint (2, (debugfile, "fill_buffer: Seen attachment marker.\n"));
+ debug_print (2, ("seen attachment marker.\n"));
while (*p++ != '\a') /* skip pseudo-ANSI sequence */
;
}
k = mbrtowc (&wc, (char *) buf + ch, cnt - ch, &mbstate);
if (k == -2 || k == -1) {
- dprint (1, (debugfile, "%s:%d: mbrtowc returned %d; errno = %d.\n",
- __FILE__, __LINE__, k, errno));
+ debug_print (1, ("mbrtowc returned %d; errno = %d.\n", k, errno));
if (col + 4 > wrap_cols)
break;
col += 4;
/* skip trailing blanks */
while (ch && (buf[ch] == ' ' || buf[ch] == '\t' || buf[ch] == '\r'))
ch--;
- cnt = ch + 1;
+ /* a very long word with leading spaces causes infinite wrapping */
+ if ((!ch) && (flags & M_PAGER_NSKIP))
+ buf_ptr = buf + cnt;
+ else
+ cnt = ch + 1;
}
else
buf_ptr = buf + cnt; /* a very long word... */
move (indexoffset + (option (OPTSTATUSONTOP) ? 0 : (indexlen - 1)),
option (OPTSTATUSONTOP) ? 0 : SidebarWidth);
SETCOLOR (MT_COLOR_STATUS);
+ BKGDSET (MT_COLOR_STATUS);
mutt_paddstr (COLS - (option (OPTSTATUSONTOP) ? 0 : SidebarWidth),
buffer);
SETCOLOR (MT_COLOR_NORMAL);
+ BKGDSET (MT_COLOR_NORMAL);
}
/* if we're not using the index, update every time */
if (index == 0)