#endif
#include <lib-lib/mem.h>
+#include <lib-lib/ascii.h>
+#include <lib-lib/str.h>
+#include <lib-lib/macros.h>
+#include <lib-lib/buffer.h>
#include "mutt.h"
-#include "buffer.h"
-#include "ascii.h"
#include "mutt_curses.h"
#include "mapping.h"
-#include "lib/intl.h"
-#include "lib/str.h"
#include "lib/debug.h"
#include <string.h>
void ci_start_color (void)
{
- memset (ColorDefs, A_NORMAL, sizeof (int) * MT_COLOR_MAX);
- ColorQuote = p_new(int, COLOR_QUOTE_INIT);
- memset (ColorQuote, A_NORMAL, sizeof (int) * COLOR_QUOTE_INIT);
- ColorQuoteSize = COLOR_QUOTE_INIT;
- ColorQuoteUsed = 0;
-
- /* set some defaults */
- ColorDefs[MT_COLOR_STATUS] = A_REVERSE;
- ColorDefs[MT_COLOR_INDICATOR] = A_REVERSE;
- ColorDefs[MT_COLOR_SEARCH] = A_REVERSE;
- ColorDefs[MT_COLOR_MARKERS] = A_REVERSE;
- /* special meaning: toggle the relevant attribute */
- ColorDefs[MT_COLOR_BOLD] = 0;
- ColorDefs[MT_COLOR_UNDERLINE] = 0;
+ memset(ColorDefs, A_NORMAL, sizeof(int) * MT_COLOR_MAX);
+ ColorQuote = p_new(int, COLOR_QUOTE_INIT);
+ memset(ColorQuote, A_NORMAL, sizeof(int) * COLOR_QUOTE_INIT);
+ ColorQuoteSize = COLOR_QUOTE_INIT;
+ ColorQuoteUsed = 0;
+
+ /* set some defaults */
+ ColorDefs[MT_COLOR_STATUS] = A_REVERSE;
+ ColorDefs[MT_COLOR_INDICATOR] = A_REVERSE;
+ ColorDefs[MT_COLOR_SEARCH] = A_REVERSE;
+ ColorDefs[MT_COLOR_MARKERS] = A_REVERSE;
+ /* special meaning: toggle the relevant attribute */
+ ColorDefs[MT_COLOR_BOLD] = 0;
+ ColorDefs[MT_COLOR_UNDERLINE] = 0;
#ifdef HAVE_COLOR
- start_color ();
+ start_color ();
#endif
}
/* find the smallest available index (object) */
i = 1;
- FOREVER {
+ for (;;) {
p = ColorList;
while (p) {
if (p->index == i)
do {
mutt_extract_token (buf, s, 0);
- if (!str_cmp ("*", buf->data)) {
+ if (!m_strcmp("*", buf->data)) {
for (tmp = ColorIndexList; tmp;) {
if (!do_cache)
do_cache = 1;
else {
for (last = NULL, tmp = ColorIndexList; tmp;
last = tmp, tmp = tmp->next) {
- if (!str_cmp (buf->data, tmp->pattern)) {
+ if (!m_strcmp(buf->data, tmp->pattern)) {
if (!do_cache)
do_cache = 1;
debug_print (1, ("Freeing pattern \"%s\" from ColorIndexList\n", tmp->pattern));
while (tmp) {
if (sensitive) {
- if (str_cmp (s, tmp->pattern) == 0)
+ if (m_strcmp(s, tmp->pattern) == 0)
break;
}
else {
return (-1);
}
tmp->next = *top;
- tmp->pattern = str_dup (s);
+ tmp->pattern = m_strdup(s);
#ifdef HAVE_COLOR
if (fg != -1 && bg != -1) {
tmp->fg = fg;