circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-09-03 14:27:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2019-03-18 15:07:51 +00:00
parent aa2b3472c5 ce6be7afd4
commit acb2413852
20 changed files with 692 additions and 454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tty-term.c
View File

@ -419,7 +419,8 @@ tty_term_find(char *name, int fd, char **cause)
const struct tty_term_code_entry *ent;
struct tty_code *code;
struct options_entry *o;
u_int size, i;
struct options_array_item *a;
u_int i;
int n, error;
const char *s, *acs;
@ -494,12 +495,12 @@ tty_term_find(char *name, int fd, char **cause)
/* Apply terminal overrides. */
o = options_get_only(global_options, "terminal-overrides");
if (options_array_size(o, &size) != -1) {
for (i = 0; i < size; i++) {
s = options_array_get(o, i);
if (s != NULL)
tty_term_override(term, s);
}
a = options_array_first(o);
while (a != NULL) {
s = options_array_item_value(a);
if (s != NULL)
tty_term_override(term, s);
a = options_array_next(a);
}
/* Delete curses data. */