circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 09:26:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	Makefile
	tty-keys.c
This commit is contained in:
Thomas Adam
2014-04-05 12:36:14 +01:00
parent 806d5dcb17 acef311fe3
commit 0c99c7dbff
19 changed files with 166 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tty-term.c
View File

@@ -308,7 +308,7 @@ tty_term_override(struct tty_term *term, const char *overrides)
}
struct tty_term *
tty_term_find(char *name, int fd, const char *overrides, char **cause)
tty_term_find(char *name, int fd, char **cause)
{
struct tty_term *term;
const struct tty_term_code_entry *ent;
@@ -386,7 +386,10 @@ tty_term_find(char *name, int fd, const char *overrides, char **cause)
break;
}
}
tty_term_override(term, overrides);
/* Apply terminal overrides. */
s = options_get_string(&global_options, "terminal-overrides");
tty_term_override(term, s);
/* Delete curses data. */
#if !defined(NCURSES_VERSION_MAJOR) || NCURSES_VERSION_MAJOR > 5 || \