===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-client.c,v
retrieving revision 1.155
retrieving revision 1.156
diff -c -r1.155 -r1.156
*** src/usr.bin/tmux/server-client.c	2015/10/18 20:42:43	1.155
--- src/usr.bin/tmux/server-client.c	2015/10/20 14:19:27	1.156
***************
*** 1,4 ****
! /* $OpenBSD: server-client.c,v 1.155 2015/10/18 20:42:43 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server-client.c,v 1.156 2015/10/20 14:19:27 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 541,547 ****
  	struct window		*w;
  	struct window_pane	*wp;
  	struct timeval		 tv;
! 	struct key_table	*table = c->keytable;
  	struct key_binding	 bd_find, *bd;
  	int			 xtimeout;
  
--- 541,547 ----
  	struct window		*w;
  	struct window_pane	*wp;
  	struct timeval		 tv;
! 	struct key_table	*table;
  	struct key_binding	 bd_find, *bd;
  	int			 xtimeout;
  
***************
*** 607,613 ****
  retry:
  	/* Try to see if there is a key binding in the current table. */
  	bd_find.key = key;
! 	bd = RB_FIND(key_bindings, &table->key_bindings, &bd_find);
  	if (bd != NULL) {
  		/*
  		 * Key was matched in this table. If currently repeating but a
--- 607,613 ----
  retry:
  	/* Try to see if there is a key binding in the current table. */
  	bd_find.key = key;
! 	bd = RB_FIND(key_bindings, &c->keytable->key_bindings, &bd_find);
  	if (bd != NULL) {
  		/*
  		 * Key was matched in this table. If currently repeating but a
***************
*** 625,630 ****
--- 625,631 ----
  		 * Take a reference to this table to make sure the key binding
  		 * doesn't disappear.
  		 */
+ 		table = c->keytable;
  		table->references++;
  
  		/*