From 6b6b0e91d0e3ee5d92f67f383172037bf1348880 Mon Sep 17 00:00:00 2001 From: nicm Date: Mon, 16 Jan 2017 23:45:08 +0000 Subject: Correctly handle -style options without all of a corresponding -fg/-bg/-attr. --- options.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'options.c') diff --git a/options.c b/options.c index ffea70be..9c260e26 100644 --- a/options.c +++ b/options.c @@ -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); } -- cgit