Change terminal-overrides to a server option (now that we have them), it

doesn't make much sense as a session option.

1 files changed, 5 insertions, 2 deletions

diff --git a/tty-term.c b/tty-term.c
index 8644a845..a66aad83 100644
--- a/tty-term.c
+++ b/tty-term.c
@@ -305,7 +305,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;
@@ -383,7 +383,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. */
 	del_curterm(cur_term);