===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-client.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -c -r1.118 -r1.119
*** src/usr.bin/tmux/server-client.c	2014/02/17 22:42:20	1.118
--- src/usr.bin/tmux/server-client.c	2014/02/23 00:53:06	1.119
***************
*** 1,4 ****
! /* $OpenBSD: server-client.c,v 1.118 2014/02/17 22:42:20 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server-client.c,v 1.119 2014/02/23 00:53:06 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 114,124 ****
  
  /* Open client terminal if needed. */
  int
! server_client_open(struct client *c, struct session *s, char **cause)
  {
- 	struct options	*oo = s != NULL ? &s->options : &global_s_options;
- 	char		*overrides;
- 
  	if (c->flags & CLIENT_CONTROL)
  		return (0);
  
--- 114,121 ----
  
  /* Open client terminal if needed. */
  int
! server_client_open(struct client *c, char **cause)
  {
  	if (c->flags & CLIENT_CONTROL)
  		return (0);
  
***************
*** 127,134 ****
  		return (-1);
  	}
  
! 	overrides = options_get_string(oo, "terminal-overrides");
! 	if (tty_open(&c->tty, overrides, cause) != 0)
  		return (-1);
  
  	return (0);
--- 124,130 ----
  		return (-1);
  	}
  
! 	if (tty_open(&c->tty, cause) != 0)
  		return (-1);
  
  	return (0);