color: integrate the hilite attribute into the pair number

Color-pair numbers and attributes can be OR'd together -- do so,
to save an attron() call whenever the hilite is on.
3 files changed