Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2019-04-23 23:02:42 +01:00
9 changed files with 175 additions and 131 deletions

View File

@ -420,6 +420,7 @@ tty_term_find(char *name, int fd, char **cause)
struct tty_code *code;
struct options_entry *o;
struct options_array_item *a;
union options_value *ov;
u_int i;
int n, error;
const char *s, *acs;
@ -497,9 +498,9 @@ tty_term_find(char *name, int fd, char **cause)
o = options_get_only(global_options, "terminal-overrides");
a = options_array_first(o);
while (a != NULL) {
s = options_array_item_value(a);
if (s != NULL)
tty_term_override(term, s);
ov = options_array_item_value(a);
if (ov != NULL)
tty_term_override(term, ov->string);
a = options_array_next(a);
}