===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/options-table.c,v
retrieving revision 1.103
retrieving revision 1.104
diff -c -r1.103 -r1.104
*** src/usr.bin/tmux/options-table.c	2019/04/07 20:18:20	1.103
--- src/usr.bin/tmux/options-table.c	2019/04/23 20:36:55	1.104
***************
*** 1,4 ****
! /* $OpenBSD: options-table.c,v 1.103 2019/04/07 20:18:20 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: options-table.c,v 1.104 2019/04/23 20:36:55 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 141,148 ****
  	},
  
  	{ .name = "command-alias",
! 	  .type = OPTIONS_TABLE_ARRAY,
  	  .scope = OPTIONS_TABLE_SERVER,
  	  .default_str = "split-pane=split-window,"
  			 "splitp=split-window,"
  			 "server-info=show-messages -JT,"
--- 141,149 ----
  	},
  
  	{ .name = "command-alias",
! 	  .type = OPTIONS_TABLE_STRING,
  	  .scope = OPTIONS_TABLE_SERVER,
+ 	  .flags = OPTIONS_TABLE_IS_ARRAY,
  	  .default_str = "split-pane=split-window,"
  			 "splitp=split-window,"
  			 "server-info=show-messages -JT,"
***************
*** 206,213 ****
  	},
  
  	{ .name = "terminal-overrides",
! 	  .type = OPTIONS_TABLE_ARRAY,
  	  .scope = OPTIONS_TABLE_SERVER,
  	  .default_str = "xterm*:XT:Ms=\\E]52;%p1%s;%p2%s\\007"
  			 ":Cs=\\E]12;%p1%s\\007:Cr=\\E]112\\007"
  			 ":Ss=\\E[%p1%d q:Se=\\E[2 q,screen*:XT",
--- 207,215 ----
  	},
  
  	{ .name = "terminal-overrides",
! 	  .type = OPTIONS_TABLE_STRING,
  	  .scope = OPTIONS_TABLE_SERVER,
+ 	  .flags = OPTIONS_TABLE_IS_ARRAY,
  	  .default_str = "xterm*:XT:Ms=\\E]52;%p1%s;%p2%s\\007"
  			 ":Cs=\\E]12;%p1%s\\007:Cr=\\E]112\\007"
  			 ":Ss=\\E[%p1%d q:Se=\\E[2 q,screen*:XT",
***************
*** 215,222 ****
  	},
  
  	{ .name = "user-keys",
! 	  .type = OPTIONS_TABLE_ARRAY,
  	  .scope = OPTIONS_TABLE_SERVER,
  	  .default_str = "",
  	  .separator = ","
  	},
--- 217,225 ----
  	},
  
  	{ .name = "user-keys",
! 	  .type = OPTIONS_TABLE_STRING,
  	  .scope = OPTIONS_TABLE_SERVER,
+ 	  .flags = OPTIONS_TABLE_IS_ARRAY,
  	  .default_str = "",
  	  .separator = ","
  	},
***************
*** 421,428 ****
  	},
  
  	{ .name = "status-format",
! 	  .type = OPTIONS_TABLE_ARRAY,
  	  .scope = OPTIONS_TABLE_SESSION,
  	  .default_arr = options_table_status_format_default,
  	},
  
--- 424,432 ----
  	},
  
  	{ .name = "status-format",
! 	  .type = OPTIONS_TABLE_STRING,
  	  .scope = OPTIONS_TABLE_SESSION,
+ 	  .flags = OPTIONS_TABLE_IS_ARRAY,
  	  .default_arr = options_table_status_format_default,
  	},
  
***************
*** 504,511 ****
  	},
  
  	{ .name = "update-environment",
! 	  .type = OPTIONS_TABLE_ARRAY,
  	  .scope = OPTIONS_TABLE_SESSION,
  	  .default_str = "DISPLAY KRB5CCNAME SSH_ASKPASS SSH_AUTH_SOCK "
  	  		 "SSH_AGENT_PID SSH_CONNECTION WINDOWID XAUTHORITY"
  	},
--- 508,516 ----
  	},
  
  	{ .name = "update-environment",
! 	  .type = OPTIONS_TABLE_STRING,
  	  .scope = OPTIONS_TABLE_SESSION,
+ 	  .flags = OPTIONS_TABLE_IS_ARRAY,
  	  .default_str = "DISPLAY KRB5CCNAME SSH_ASKPASS SSH_AUTH_SOCK "
  	  		 "SSH_AGENT_PID SSH_CONNECTION WINDOWID XAUTHORITY"
  	},