===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-client.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -c -r1.62 -r1.63
*** src/usr.bin/tmux/server-client.c	2011/12/24 08:26:59	1.62
--- src/usr.bin/tmux/server-client.c	2012/01/21 08:40:09	1.63
***************
*** 1,4 ****
! /* $OpenBSD: server-client.c,v 1.62 2011/12/24 08:26:59 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server-client.c,v 1.63 2012/01/21 08:40:09 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 273,281 ****
  	struct options		*oo;
  	struct timeval		 tv;
  	struct key_binding	*bd;
- 	struct keylist		*keylist;
  	int		      	 xtimeout, isprefix;
- 	u_int			 i;
  
  	/* Check the client is good to accept input. */
  	if ((c->flags & (CLIENT_DEAD|CLIENT_SUSPENDED)) != 0)
--- 273,279 ----
***************
*** 360,373 ****
  	}
  
  	/* Is this a prefix key? */
! 	keylist = options_get_data(&c->session->options, "prefix");
! 	isprefix = 0;
! 	for (i = 0; i < ARRAY_LENGTH(keylist); i++) {
! 		if (key == ARRAY_ITEM(keylist, i)) {
! 			isprefix = 1;
! 			break;
! 		}
! 	}
  
  	/* No previous prefix key. */
  	if (!(c->flags & CLIENT_PREFIX)) {
--- 358,369 ----
  	}
  
  	/* Is this a prefix key? */
! 	if (key == options_get_number(&c->session->options, "prefix"))
! 		isprefix = 1;
! 	else if (key == options_get_number(&c->session->options, "prefix2"))
! 		isprefix = 1;
! 	else
! 		isprefix = 0;
  
  	/* No previous prefix key. */
  	if (!(c->flags & CLIENT_PREFIX)) {