Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2017-01-31 00:01:12 +00:00
4 changed files with 8 additions and 5 deletions

View File

@ -658,7 +658,7 @@ format_find(struct format_tree *ft, const char *key, int modifiers)
if (o == NULL)
o = options_parse_get(global_s_options, key, &idx, 0);
if (o != NULL) {
found = options_tostring(o, idx);
found = options_tostring(o, idx, 1);
goto found;
}
}