diff options
| author |   nicm <nicm@openbsd.org> | 2020-04-23 10:22:53 +0000 |
|---|---|---|
| committer | nicm <nicm@openbsd.org> | 2020-04-23 10:22:53 +0000 |
| commit | 9d01fefa1f0fbda548f63d94f7dd88ada676428c (patch) | |
| tree | 7cf595a657984920bb43fcde6be00869ab850567 | |
| parent | Make debug output less verbose. (diff) | |
| download | wireguard-openbsd-9d01fefa1f0fbda548f63d94f7dd88ada676428c.tar.xz wireguard-openbsd-9d01fefa1f0fbda548f63d94f7dd88ada676428c.zip | |
Overrides need to be applied both before and after features in case they
change flags used to detect a feature.
| -rw-r--r-- | usr.bin/tmux/tty-term.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/usr.bin/tmux/tty-term.c b/usr.bin/tmux/tty-term.c index d265605c16e..399c307a832 100644 --- a/usr.bin/tmux/tty-term.c +++ b/usr.bin/tmux/tty-term.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty-term.c,v 1.75 2020/04/20 15:37:32 nicm Exp $ */ +/* $OpenBSD: tty-term.c,v 1.76 2020/04/23 10:22:53 nicm Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com> @@ -528,6 +528,9 @@ tty_term_create(struct tty *tty, char *name, int *feat, int fd, char **cause) /* Delete curses data. */ del_curterm(cur_term); + /* Apply overrides so any capabilities used for features are changed. */ + tty_term_apply_overrides(term); + /* These are always required. */ if (!tty_term_has(term, TTYC_CLEAR)) { xasprintf(cause, "terminal does not support clear"); @@ -554,7 +557,7 @@ tty_term_create(struct tty *tty, char *name, int *feat, int fd, char **cause) if (tty_term_flag(term, TTYC_XT)) tty_add_features(feat, "title", ":,"); - /* Apply the features and overrides. */ + /* Apply the features and overrides again. */ tty_apply_features(term, *feat); tty_term_apply_overrides(term); |