===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.702
retrieving revision 1.703
diff -c -r1.702 -r1.703
*** src/usr.bin/tmux/tmux.h	2017/01/23 10:09:43	1.702
--- src/usr.bin/tmux/tmux.h	2017/01/24 19:11:46	1.703
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.702 2017/01/23 10:09:43 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.703 2017/01/24 19:11:46 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 1479,1484 ****
--- 1479,1485 ----
  	const char		 *default_str;
  	long long		  default_num;
  
+ 	const char		 *separator;
  	const char		 *style;
  };
  
***************
*** 1616,1632 ****
  struct options_entry *options_get_only(struct options *, const char *);
  struct options_entry *options_get(struct options *, const char *);
  void		 options_remove(struct options_entry *);
  const char	*options_array_get(struct options_entry *, u_int);
! int		 options_array_set(struct options_entry *, u_int, const char *);
  int		 options_array_size(struct options_entry *, u_int *);
  int		 options_isstring(struct options_entry *);
  const char	*options_tostring(struct options_entry *, int);
  char		*options_parse(const char *, int *);
  struct options_entry *options_parse_get(struct options *, const char *, int *,
! 		    int);
  char		*options_match(const char *, int *, int *);
  struct options_entry *options_match_get(struct options *, const char *, int *,
! 		    int, int *);
  const char	*options_get_string(struct options *, const char *);
  long long	 options_get_number(struct options *, const char *);
  const struct grid_cell *options_get_style(struct options *, const char *);
--- 1617,1636 ----
  struct options_entry *options_get_only(struct options *, const char *);
  struct options_entry *options_get(struct options *, const char *);
  void		 options_remove(struct options_entry *);
+ void		 options_array_clear(struct options_entry *);
  const char	*options_array_get(struct options_entry *, u_int);
! int		 options_array_set(struct options_entry *, u_int, const char *,
! 		     int);
  int		 options_array_size(struct options_entry *, u_int *);
+ void		 options_array_assign(struct options_entry *, const char *);
  int		 options_isstring(struct options_entry *);
  const char	*options_tostring(struct options_entry *, int);
  char		*options_parse(const char *, int *);
  struct options_entry *options_parse_get(struct options *, const char *, int *,
! 		     int);
  char		*options_match(const char *, int *, int *);
  struct options_entry *options_match_get(struct options *, const char *, int *,
! 		     int, int *);
  const char	*options_get_string(struct options *, const char *);
  long long	 options_get_number(struct options *, const char *);
  const struct grid_cell *options_get_style(struct options *, const char *);