X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pager.c;h=083c9b037048c4ebc4800e34d1673f3cfca2c806;hp=a25490c52189b6f978c2feab93f9ff990aa79679;hb=18ebc21bf1d29ed07fa007329879493493e18eb3;hpb=688ac22f746f785c27ac99ac86aa85a3035a3638 diff --git a/pager.c b/pager.c index a25490c..083c9b0 100644 --- a/pager.c +++ b/pager.c @@ -217,16 +217,13 @@ resolve_color (struct line_t *lineInfo, int n, int cnt, int flags, /* handle "special" bold & underlined characters */ if (special || a->attr) { -#ifdef HAVE_COLOR if ((a->attr & ANSI_COLOR)) { if (a->pair == -1) a->pair = mutt_alloc_color (a->fg, a->bg); color = a->pair; if (a->attr & ANSI_BOLD) color |= A_BOLD; - } - else -#endif + } else if ((special & A_BOLD) || (a->attr & ANSI_BOLD)) { if (ColorDefs[MT_COLOR_BOLD] && !search) color = ColorDefs[MT_COLOR_BOLD]; @@ -771,10 +768,8 @@ static int grok_ansi (unsigned char *buf, int pos, ansi_attr * a) /* Character Attributes */ if (option (OPTALLOWANSI) && a != NULL && buf[x] == 'm') { if (pos == x) { -#ifdef HAVE_COLOR if (a->pair != -1) mutt_free_color (a->fg, a->bg); -#endif a->attr = ANSI_OFF; a->pair = -1; } @@ -803,10 +798,8 @@ static int grok_ansi (unsigned char *buf, int pos, ansi_attr * a) pos += 2; } else if (buf[pos] == '3' && isdigit (buf[pos + 1])) { -#ifdef HAVE_COLOR if (a->pair != -1) mutt_free_color (a->fg, a->bg); -#endif a->pair = -1; a->attr |= ANSI_COLOR; if (buf[pos + 1] != '9') @@ -814,10 +807,8 @@ static int grok_ansi (unsigned char *buf, int pos, ansi_attr * a) pos += 3; } else if (buf[pos] == '4' && isdigit (buf[pos + 1])) { -#ifdef HAVE_COLOR if (a->pair != -1) mutt_free_color (a->fg, a->bg); -#endif a->pair = -1; a->attr |= ANSI_COLOR; if (buf[pos + 1] != '9')