===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-attach-session.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -c -r1.68 -r1.69
*** src/usr.bin/tmux/cmd-attach-session.c	2017/02/03 11:57:27	1.68
--- src/usr.bin/tmux/cmd-attach-session.c	2017/02/06 15:00:41	1.69
***************
*** 1,4 ****
! /* $OpenBSD: cmd-attach-session.c,v 1.68 2017/02/03 11:57:27 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: cmd-attach-session.c,v 1.69 2017/02/06 15:00:41 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 98,103 ****
--- 98,105 ----
  			environ_update(s->options, c->environ, s->environ);
  
  		c->session = s;
+ 		if (!item->repeat)
+ 			server_client_set_key_table(c, NULL);
  		status_timer_start(c);
  		notify_client("client-session-changed", c);
  		session_update_activity(s, NULL);