Changeset 3fa0181 for functions.c


Ignore:
Timestamp:
May 1, 2011, 5:30:33 PM (10 years ago)
Author:
GitHub Merge Button <merge-button@github.com>
Parents:
4fd211f (diff), 7b4f3be (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:
Merge 7b4f3bea704ed82f2c36ba19fcf354d7442a5bb7 into 4fd211f3a533efcedaf4d0dc7c01e02087ad2e39
File:
1 edited

Legend:

Unmodified
Added
Removed
  • functions.c

    r4fd211f r7b4f3be  
    18171817          owl_global_get_cols(&g));
    18181818
    1819   if (owl_global_get_hascolors(&g)) {
     1819  if (has_colors()) {
    18201820    owl_fmtext_append_normal(&fm, "Color: Yes\n");
    1821     owl_fmtext_appendf_normal(&fm, "Number of color pairs: %i\n", owl_global_get_colorpairs(&g));
     1821    owl_fmtext_appendf_normal(&fm, "Number of color pairs: %i\n", owl_util_get_colorpairs());
    18221822    owl_fmtext_appendf_normal(&fm, "Can change colors: %s\n", can_change_color() ? "yes" : "no");
    18231823  } else {
     
    22262226    f = fl->data;
    22272227    owl_fmtext_append_normal(&fm, "   ");
    2228     if (owl_global_get_hascolors(&g)) {
    2229       owl_fmtext_append_normal_color(&fm, owl_filter_get_name(f), owl_filter_get_fgcolor(f), owl_filter_get_bgcolor(f));
    2230     } else {
    2231       owl_fmtext_append_normal(&fm, owl_filter_get_name(f));
    2232     }
     2228    owl_fmtext_append_normal_color(&fm, owl_filter_get_name(f),
     2229                                   owl_filter_get_fgcolor(f),
     2230                                   owl_filter_get_bgcolor(f));
    22332231    owl_fmtext_append_normal(&fm, "\n");
    22342232  }
Note: See TracChangeset for help on using the changeset viewer.