diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2014-04-15 00:33:56 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2014-04-15 00:33:56 +0100 |
| commit | 4abc8f717a5a786a4dd9e4f24d64ec76b0829993 (patch) | |
| tree | d52bbbd572c1fb638ac60e75a43d92ede1955155 /server-client.c | |
| parent | 8e1cef404022422f9f57c72d139f19a82a70a791 (diff) | |
| parent | 57c514d2f85f9d1c81601bae32131f1cd2948422 (diff) | |
| download | rtmux-4abc8f717a5a786a4dd9e4f24d64ec76b0829993.tar.gz rtmux-4abc8f717a5a786a4dd9e4f24d64ec76b0829993.tar.bz2 rtmux-4abc8f717a5a786a4dd9e4f24d64ec76b0829993.zip | |
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
Diffstat (limited to 'server-client.c')
| -rw-r--r-- | server-client.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/server-client.c b/server-client.c index 98d1e043..2c407b8c 100644 --- a/server-client.c +++ b/server-client.c @@ -113,11 +113,8 @@ server_client_create(int fd) /* Open client terminal if needed. */ int -server_client_open(struct client *c, struct session *s, char **cause) +server_client_open(struct client *c, char **cause) { - struct options *oo = s != NULL ? &s->options : &global_s_options; - char *overrides; - if (c->flags & CLIENT_CONTROL) return (0); @@ -126,8 +123,7 @@ server_client_open(struct client *c, struct session *s, char **cause) return (-1); } - overrides = options_get_string(oo, "terminal-overrides"); - if (tty_open(&c->tty, overrides, cause) != 0) + if (tty_open(&c->tty, cause) != 0) return (-1); return (0); |