diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2014-04-15 00:33:56 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2014-04-15 00:33:56 +0100 |
| commit | 4abc8f717a5a786a4dd9e4f24d64ec76b0829993 (patch) | |
| tree | d52bbbd572c1fb638ac60e75a43d92ede1955155 /tty-term.c | |
| parent | 8e1cef404022422f9f57c72d139f19a82a70a791 (diff) | |
| parent | 57c514d2f85f9d1c81601bae32131f1cd2948422 (diff) | |
| download | rtmux-4abc8f717a5a786a4dd9e4f24d64ec76b0829993.tar.gz rtmux-4abc8f717a5a786a4dd9e4f24d64ec76b0829993.tar.bz2 rtmux-4abc8f717a5a786a4dd9e4f24d64ec76b0829993.zip | |
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
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 || \ |