===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.1069
retrieving revision 1.1070
diff -c -r1.1069 -r1.1070
*** src/usr.bin/tmux/tmux.h	2020/06/13 09:05:53	1.1069
--- src/usr.bin/tmux/tmux.h	2020/06/16 08:18:34	1.1070
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.1069 2020/06/13 09:05:53 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.1070 2020/06/16 08:18:34 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 1988,1994 ****
  const struct options_table_entry *options_table_entry(struct options_entry *);
  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 *);
  union options_value *options_array_get(struct options_entry *, u_int);
  int		 options_array_set(struct options_entry *, u_int, const char *,
--- 1988,1993 ----
***************
*** 2025,2030 ****
--- 2024,2031 ----
  		     const struct options_table_entry *, const char *,
  		     const char *, int, char **);
  void		 options_push_changes(const char *);
+ int		 options_remove_or_default(struct options_entry *, int,
+ 		     char **);
  
  /* options-table.c */
  extern const struct options_table_entry options_table[];
***************
*** 2325,2331 ****
--- 2326,2334 ----
  void	 key_bindings_add(const char *, key_code, const char *, int,
  	     struct cmd_list *);
  void	 key_bindings_remove(const char *, key_code);
+ void	 key_bindings_reset(const char *, key_code);
  void	 key_bindings_remove_table(const char *);
+ void	 key_bindings_reset_table(const char *);
  void	 key_bindings_init(void);
  struct cmdq_item *key_bindings_dispatch(struct key_binding *,
  	     struct cmdq_item *, struct client *, struct key_event *,
***************
*** 2802,2807 ****
--- 2805,2811 ----
  	     struct mode_tree_item *, void *, uint64_t, const char *,
  	     const char *, int);
  void	 mode_tree_draw_as_parent(struct mode_tree_item *);
+ void	 mode_tree_no_tag(struct mode_tree_item *);
  void	 mode_tree_remove(struct mode_tree_data *, struct mode_tree_item *);
  void	 mode_tree_draw(struct mode_tree_data *);
  int	 mode_tree_key(struct mode_tree_data *, struct client *, key_code *,