Merge remote-tracking branch 'upstream/master' into bind_mode

This commit is contained in:
Julian Aron Prenner
2014-01-19 11:01:24 +01:00
6 changed files with 19 additions and 51 deletions

View File

@@ -360,7 +360,7 @@ rgb_color_t highlight_get_color(highlight_spec_t highlight, bool is_background)
size_t idx = highlight_get_primary(highlight);
if (idx >= VAR_COUNT)
{
idx = 0;
return rgb_color_t::normal();
}
env_var_t val_wstr = env_get_string(highlight_var[idx]);