From 766b425d051a833dac768d6dc9eafc87a3f03146 Mon Sep 17 00:00:00 2001 From: nicm Date: Thu, 23 Apr 2020 10:22:53 +0000 Subject: [PATCH 2/2] Overrides need to be applied both before and after features in case they change flags used to detect a feature. --- tty-term.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tty-term.c b/tty-term.c index f4a18b63..f3dbae5c 100644 --- a/tty-term.c +++ b/tty-term.c @@ -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);