Merge branch 'obsd-master'

Conflicts:
	Makefile
	client.c
	server-client.c
	server.c
	tmux.c
	tmux.h

1 files changed, 1 insertions, 1 deletions

diff --git a/tty-term.c b/tty-term.c
index 550fd16d..98a90bc6 100644
--- a/tty-term.c
+++ b/tty-term.c
@@ -460,7 +460,7 @@ tty_term_find(char *name, int fd, char **cause)
 	}
 
 	/* Apply terminal overrides. */
-	s = options_get_string(&global_options, "terminal-overrides");
+	s = options_get_string(global_options, "terminal-overrides");
 	tty_term_override(term, s);
 
 	/* Delete curses data. */