Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Jari Matilainen 2014-07-24 00:00:05 +02:00
commit a97e883e4a

View file

@ -370,7 +370,7 @@ void term_set_color(TERM_WINDOW *window, int col)
(fg != 0 || (col & ATTR_RESETFG) == 0)) { (fg != 0 || (col & ATTR_RESETFG) == 0)) {
if (term_use_colors) { if (term_use_colors) {
last_fg = fg; last_fg = fg;
if (!(fg & 0xff)) if (fg && !(fg & 0xff))
termctl_set_color_24bit(0, last_fg >> 8); termctl_set_color_24bit(0, last_fg >> 8);
else else
terminfo_set_fg(last_fg); terminfo_set_fg(last_fg);
@ -387,7 +387,7 @@ void term_set_color(TERM_WINDOW *window, int col)
(bg != 0 || (col & ATTR_RESETBG) == 0)) { (bg != 0 || (col & ATTR_RESETBG) == 0)) {
if (term_use_colors) { if (term_use_colors) {
last_bg = bg; last_bg = bg;
if (!(bg & 0xff)) if (bg && !(bg & 0xff))
termctl_set_color_24bit(1, last_bg >> 8); termctl_set_color_24bit(1, last_bg >> 8);
else else
terminfo_set_bg(last_bg); terminfo_set_bg(last_bg);