circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 09:26:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source 
Conflicts:
	Makefile
	tty-keys.c
This commit is contained in:
Thomas Adam
2014-04-05 12:36:14 +01:00
parent 806d5dcb17 acef311fe3
commit 0c99c7dbff
19 changed files with 166 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server-client.c
View File

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