Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2020-04-16 16:01:35 +01:00
10 changed files with 87 additions and 23 deletions

View File

@ -2569,7 +2569,7 @@ format_defaults_client(struct format_tree *ft, struct client *c)
format_add(ft, "client_prefix", "%d", 1);
format_add(ft, "client_key_table", "%s", c->keytable->name);
if (tty->flags & TTY_UTF8)
if (tty_get_flags(tty) & TERM_UTF8)
format_add(ft, "client_utf8", "%d", 1);
else
format_add(ft, "client_utf8", "%d", 0);