From f1828921dfed4b7f2ba38b8c4a370b42965c404c Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Sun, 23 Feb 2014 00:53:06 +0000
Subject: Change terminal-overrides to a server option (now that we have them),
 it doesn't make much sense as a session option.

---
 tty-term.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'tty-term.c')

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);
-- 
cgit