===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/options-table.c,v
retrieving revision 1.90
retrieving revision 1.91
diff -c -r1.90 -r1.91
*** src/usr.bin/tmux/options-table.c	2017/06/23 15:36:52	1.90
--- src/usr.bin/tmux/options-table.c	2017/07/26 16:14:08	1.91
***************
*** 1,4 ****
! /* $OpenBSD: options-table.c,v 1.90 2017/06/23 15:36:52 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: options-table.c,v 1.91 2017/07/26 16:14:08 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 51,56 ****
--- 51,59 ----
  static const char *options_table_bell_action_list[] = {
  	"none", "any", "current", "other", NULL
  };
+ static const char *options_table_visual_bell_list[] = {
+ 	"off", "on", "both", NULL
+ };
  static const char *options_table_pane_status_list[] = {
  	"off", "top", "bottom", NULL
  };
***************
*** 143,148 ****
--- 146,158 ----
  	  .separator = ","
  	},
  
+ 	{ .name = "activity-action",
+ 	  .type = OPTIONS_TABLE_CHOICE,
+ 	  .scope = OPTIONS_TABLE_SESSION,
+ 	  .choices = options_table_bell_action_list,
+ 	  .default_num = BELL_OTHER
+ 	},
+ 
  	{ .name = "assume-paste-time",
  	  .type = OPTIONS_TABLE_NUMBER,
  	  .scope = OPTIONS_TABLE_SESSION,
***************
*** 166,177 ****
  	  .default_num = BELL_ANY
  	},
  
- 	{ .name = "bell-on-alert",
- 	  .type = OPTIONS_TABLE_FLAG,
- 	  .scope = OPTIONS_TABLE_SESSION,
- 	  .default_num = 0
- 	},
- 
  	{ .name = "default-command",
  	  .type = OPTIONS_TABLE_STRING,
  	  .scope = OPTIONS_TABLE_SESSION,
--- 176,181 ----
***************
*** 350,355 ****
--- 354,366 ----
  	  .default_str = "#S:#I:#W - \"#T\" #{session_alerts}"
  	},
  
+ 	{ .name = "silence-action",
+ 	  .type = OPTIONS_TABLE_CHOICE,
+ 	  .scope = OPTIONS_TABLE_SESSION,
+ 	  .choices = options_table_bell_action_list,
+ 	  .default_num = BELL_OTHER
+ 	},
+ 
  	{ .name = "status",
  	  .type = OPTIONS_TABLE_FLAG,
  	  .scope = OPTIONS_TABLE_SESSION,
***************
*** 502,522 ****
  	},
  
  	{ .name = "visual-activity",
! 	  .type = OPTIONS_TABLE_FLAG,
  	  .scope = OPTIONS_TABLE_SESSION,
! 	  .default_num = 0
  	},
  
  	{ .name = "visual-bell",
! 	  .type = OPTIONS_TABLE_FLAG,
  	  .scope = OPTIONS_TABLE_SESSION,
! 	  .default_num = 0
  	},
  
  	{ .name = "visual-silence",
! 	  .type = OPTIONS_TABLE_FLAG,
  	  .scope = OPTIONS_TABLE_SESSION,
! 	  .default_num = 0
  	},
  
  	{ .name = "word-separators",
--- 513,536 ----
  	},
  
  	{ .name = "visual-activity",
! 	  .type = OPTIONS_TABLE_CHOICE,
  	  .scope = OPTIONS_TABLE_SESSION,
! 	  .choices = options_table_visual_bell_list,
! 	  .default_num = VISUAL_OFF
  	},
  
  	{ .name = "visual-bell",
! 	  .type = OPTIONS_TABLE_CHOICE,
  	  .scope = OPTIONS_TABLE_SESSION,
! 	  .choices = options_table_visual_bell_list,
! 	  .default_num = VISUAL_OFF
  	},
  
  	{ .name = "visual-silence",
! 	  .type = OPTIONS_TABLE_CHOICE,
  	  .scope = OPTIONS_TABLE_SESSION,
! 	  .choices = options_table_visual_bell_list,
! 	  .default_num = VISUAL_OFF
  	},
  
  	{ .name = "word-separators",