===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/options-table.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -c -r1.54 -r1.55
*** src/usr.bin/tmux/options-table.c	2015/04/19 21:05:27	1.54
--- src/usr.bin/tmux/options-table.c	2015/04/19 21:34:21	1.55
***************
*** 1,4 ****
! /* $OpenBSD: options-table.c,v 1.54 2015/04/19 21:05:27 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: options-table.c,v 1.55 2015/04/19 21:34:21 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 36,44 ****
  const char *options_table_mode_keys_list[] = {
  	"emacs", "vi", NULL
  };
- const char *options_table_mode_mouse_list[] = {
- 	"off", "on", "copy-mode", NULL
- };
  const char *options_table_clock_mode_style_list[] = {
  	"12", "24", NULL
  };
--- 36,41 ----
***************
*** 255,275 ****
  	  .default_str = "bg=yellow,fg=black"
  	},
  
! 	{ .name = "mouse-resize-pane",
  	  .type = OPTIONS_TABLE_FLAG,
  	  .default_num = 0
  	},
  
- 	{ .name = "mouse-select-pane",
- 	  .type = OPTIONS_TABLE_FLAG,
- 	  .default_num = 0
- 	},
- 
- 	{ .name = "mouse-select-window",
- 	  .type = OPTIONS_TABLE_FLAG,
- 	  .default_num = 0
- 	},
- 
  	{ .name = "mouse-utf8",
  	  .type = OPTIONS_TABLE_FLAG,
  	  .default_num = 0
--- 252,262 ----
  	  .default_str = "bg=yellow,fg=black"
  	},
  
! 	{ .name = "mouse",
  	  .type = OPTIONS_TABLE_FLAG,
  	  .default_num = 0
  	},
  
  	{ .name = "mouse-utf8",
  	  .type = OPTIONS_TABLE_FLAG,
  	  .default_num = 0
***************
*** 573,584 ****
  	  .type = OPTIONS_TABLE_CHOICE,
  	  .choices = options_table_mode_keys_list,
  	  .default_num = MODEKEY_EMACS
- 	},
- 
- 	{ .name = "mode-mouse",
- 	  .type = OPTIONS_TABLE_CHOICE,
- 	  .choices = options_table_mode_mouse_list,
- 	  .default_num = 0
  	},
  
  	{ .name = "mode-style",
--- 560,565 ----