diff options
| author | Thomas Adam <thomas@xteddy.org> | 2014-04-05 12:36:14 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2014-04-05 12:36:14 +0100 |
| commit | 0c99c7dbff21082a5f0774e6193b9c9b9a160882 (patch) | |
| tree | 852fa9fde3126091fa90ee6604097373076772b1 /tty-term.c | |
| parent | 806d5dcb17c26d2abcbf4328a9ec419ada3d4a3f (diff) | |
| parent | acef311fe356f408690e9f94727ed63a934b742f (diff) | |
| download | rtmux-0c99c7dbff21082a5f0774e6193b9c9b9a160882.tar.gz rtmux-0c99c7dbff21082a5f0774e6193b9c9b9a160882.tar.bz2 rtmux-0c99c7dbff21082a5f0774e6193b9c9b9a160882.zip | |
Merge branch 'obsd-master'
Conflicts:
Makefile
tty-keys.c
Diffstat (limited to 'tty-term.c')
| -rw-r--r-- | tty-term.c | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -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 || \ |