===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/window-choose.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -c -r1.66 -r1.67
*** src/usr.bin/tmux/Attic/window-choose.c	2015/08/28 12:25:42	1.66
--- src/usr.bin/tmux/Attic/window-choose.c	2015/10/27 15:58:43	1.67
***************
*** 1,4 ****
! /* $OpenBSD: window-choose.c,v 1.66 2015/08/28 12:25:42 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: window-choose.c,v 1.67 2015/10/27 15:58:43 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 169,175 ****
  	screen_init(s, screen_size_x(&wp->base), screen_size_y(&wp->base), 0);
  	s->mode &= ~MODE_CURSOR;
  
! 	keys = options_get_number(&wp->window->options, "mode-keys");
  	if (keys == MODEKEY_EMACS)
  		mode_key_init(&data->mdata, &mode_key_tree_emacs_choice);
  	else
--- 169,175 ----
  	screen_init(s, screen_size_x(&wp->base), screen_size_y(&wp->base), 0);
  	s->mode &= ~MODE_CURSOR;
  
! 	keys = options_get_number(wp->window->options, "mode-keys");
  	if (keys == MODEKEY_EMACS)
  		mode_key_init(&data->mdata, &mode_key_tree_emacs_choice);
  	else
***************
*** 748,754 ****
  {
  	struct window_choose_mode_data	*data = wp->modedata;
  	struct window_choose_mode_item	*item;
! 	struct options			*oo = &wp->window->options;
  	struct screen			*s = &data->screen;
  	struct grid_cell		 gc;
  	size_t				 last, xoff = 0;
--- 748,754 ----
  {
  	struct window_choose_mode_data	*data = wp->modedata;
  	struct window_choose_mode_item	*item;
! 	struct options			*oo = wp->window->options;
  	struct screen			*s = &data->screen;
  	struct grid_cell		 gc;
  	size_t				 last, xoff = 0;
***************
*** 759,765 ****
  		fatalx("called before callback assigned");
  
  	last = screen_size_y(s) - 1;
! 	utf8flag = options_get_number(&wp->window->options, "utf8");
  	memcpy(&gc, &grid_default_cell, sizeof gc);
  	if (data->selected == data->top + py)
  		style_apply(&gc, oo, "mode-style");
--- 759,765 ----
  		fatalx("called before callback assigned");
  
  	last = screen_size_y(s) - 1;
! 	utf8flag = options_get_number(wp->window->options, "utf8");
  	memcpy(&gc, &grid_default_cell, sizeof gc);
  	if (data->selected == data->top + py)
  		style_apply(&gc, oo, "mode-style");