===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-client.c,v
retrieving revision 1.253
retrieving revision 1.254
diff -c -r1.253 -r1.254
*** src/usr.bin/tmux/server-client.c	2018/07/17 18:02:40	1.253
--- src/usr.bin/tmux/server-client.c	2018/08/02 11:44:07	1.254
***************
*** 1,4 ****
! /* $OpenBSD: server-client.c,v 1.253 2018/07/17 18:02:40 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: server-client.c,v 1.254 2018/08/02 11:44:07 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 43,48 ****
--- 43,50 ----
  static void	server_client_set_title(struct client *);
  static void	server_client_reset_state(struct client *);
  static int	server_client_assume_paste(struct session *);
+ static void	server_client_clear_identify(struct client *,
+ 		    struct window_pane *);
  
  static void	server_client_dispatch(struct imsg *, void *);
  static void	server_client_dispatch_command(struct client *, struct imsg *);
***************
*** 93,99 ****
  }
  
  /* Clear identify mode on client. */
! void
  server_client_clear_identify(struct client *c, struct window_pane *wp)
  {
  	if (~c->flags & CLIENT_IDENTIFY)
--- 95,101 ----
  }
  
  /* Clear identify mode on client. */
! static void
  server_client_clear_identify(struct client *c, struct window_pane *wp)
  {
  	if (~c->flags & CLIENT_IDENTIFY)
***************
*** 815,821 ****
  	struct window_pane	*wp;
  	struct timeval		 tv;
  	struct key_table	*table, *first;
! 	struct key_binding	 bd_find, *bd;
  	int			 xtimeout, flags;
  	struct cmd_find_state	 fs;
  	key_code		 key0;
--- 817,823 ----
  	struct window_pane	*wp;
  	struct timeval		 tv;
  	struct key_table	*table, *first;
! 	struct key_binding	*bd;
  	int			 xtimeout, flags;
  	struct cmd_find_state	 fs;
  	key_code		 key0;
***************
*** 928,935 ****
  
  try_again:
  	/* Try to see if there is a key binding in the current table. */
! 	bd_find.key = key0;
! 	bd = RB_FIND(key_bindings, &table->key_bindings, &bd_find);
  	if (bd != NULL) {
  		/*
  		 * Key was matched in this table. If currently repeating but a
--- 930,936 ----
  
  try_again:
  	/* Try to see if there is a key binding in the current table. */
! 	bd = key_bindings_get(table, key0);
  	if (bd != NULL) {
  		/*
  		 * Key was matched in this table. If currently repeating but a