Merge branch 'obsd-master'

pull/662/merge
Thomas Adam 2017-01-17 02:01:11 +00:00
commit 64c486ae81
1 changed files with 6 additions and 3 deletions

View File

@ -647,11 +647,14 @@ options_style_update_old(struct options *oo, struct options_entry *o)
size = strrchr(o->name, '-') - o->name;
xsnprintf(newname, sizeof newname, "%.*s-bg", size, o->name);
options_set_number(oo, newname, o->style.bg);
if (options_get(oo, newname) != NULL)
options_set_number(oo, newname, o->style.bg);
xsnprintf(newname, sizeof newname, "%.*s-fg", size, o->name);
options_set_number(oo, newname, o->style.fg);
if (options_get(oo, newname) != NULL)
options_set_number(oo, newname, o->style.fg);
xsnprintf(newname, sizeof newname, "%.*s-attr", size, o->name);
options_set_number(oo, newname, o->style.attr);
if (options_get(oo, newname) != NULL)
options_set_number(oo, newname, o->style.attr);
}