===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/window-choose.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -c -r1.42 -r1.43
*** src/usr.bin/tmux/Attic/window-choose.c	2013/03/22 15:50:42	1.42
--- src/usr.bin/tmux/Attic/window-choose.c	2013/03/22 15:52:42	1.43
***************
*** 1,4 ****
! /* $OpenBSD: window-choose.c,v 1.42 2013/03/22 15:50:42 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: window-choose.c,v 1.43 2013/03/22 15:52:42 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 492,498 ****
  	items = ARRAY_LENGTH(&data->list);
  
  	if (data->input_type == WINDOW_CHOOSE_GOTO_ITEM) {
! 		switch (mode_key_lookup(&data->mdata, key)) {
  		case MODEKEYCHOICE_CANCEL:
  			data->input_type = WINDOW_CHOOSE_NORMAL;
  			window_choose_redraw_screen(wp);
--- 492,498 ----
  	items = ARRAY_LENGTH(&data->list);
  
  	if (data->input_type == WINDOW_CHOOSE_GOTO_ITEM) {
! 		switch (mode_key_lookup(&data->mdata, key, NULL)) {
  		case MODEKEYCHOICE_CANCEL:
  			data->input_type = WINDOW_CHOOSE_NORMAL;
  			window_choose_redraw_screen(wp);
***************
*** 523,529 ****
  		return;
  	}
  
! 	switch (mode_key_lookup(&data->mdata, key)) {
  	case MODEKEYCHOICE_CANCEL:
  		window_choose_fire_callback(wp, NULL);
  		break;
--- 523,529 ----
  		return;
  	}
  
! 	switch (mode_key_lookup(&data->mdata, key, NULL)) {
  	case MODEKEYCHOICE_CANCEL:
  		window_choose_fire_callback(wp, NULL);
  		break;
***************
*** 777,783 ****
  	int			mkey;
  
  	for (ptr = keys; *ptr != '\0'; ptr++) {
! 		mkey = mode_key_lookup(&data->mdata, *ptr);
  		if (mkey != MODEKEY_NONE && mkey != MODEKEY_OTHER)
  			continue;
  		if (idx-- == 0)
--- 777,783 ----
  	int			mkey;
  
  	for (ptr = keys; *ptr != '\0'; ptr++) {
! 		mkey = mode_key_lookup(&data->mdata, *ptr, NULL);
  		if (mkey != MODEKEY_NONE && mkey != MODEKEY_OTHER)
  			continue;
  		if (idx-- == 0)
***************
*** 797,803 ****
  	u_int			idx = 0;
  
  	for (ptr = keys; *ptr != '\0'; ptr++) {
! 		mkey = mode_key_lookup(&data->mdata, *ptr);
  		if (mkey != MODEKEY_NONE && mkey != MODEKEY_OTHER)
  			continue;
  		if (key == *ptr)
--- 797,803 ----
  	u_int			idx = 0;
  
  	for (ptr = keys; *ptr != '\0'; ptr++) {
! 		mkey = mode_key_lookup(&data->mdata, *ptr, NULL);
  		if (mkey != MODEKEY_NONE && mkey != MODEKEY_OTHER)
  			continue;
  		if (key == *ptr)