===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.304
retrieving revision 1.305
diff -c -r1.304 -r1.305
*** src/usr.bin/tmux/tmux.h	2012/01/21 08:10:21	1.304
--- src/usr.bin/tmux/tmux.h	2012/01/21 08:40:09	1.305
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.304 2012/01/21 08:10:21 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.305 2012/01/21 08:40:09 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 673,682 ****
  
  	char		*str;
  	long long	 num;
- 	void		*data;
  
- 	void		 (*freefn)(void *);
- 
  	SPLAY_ENTRY(options_entry) entry;
  };
  
--- 673,679 ----
***************
*** 685,693 ****
  	struct options	*parent;
  };
  
- /* Key list for prefix option. */
- ARRAY_DECL(keylist, int);
- 
  /* Scheduled job. */
  struct job {
  	char		*cmd;
--- 682,687 ----
***************
*** 1294,1300 ****
  enum options_table_type {
  	OPTIONS_TABLE_STRING,
  	OPTIONS_TABLE_NUMBER,
! 	OPTIONS_TABLE_KEYS,
  	OPTIONS_TABLE_COLOUR,
  	OPTIONS_TABLE_ATTRIBUTES,
  	OPTIONS_TABLE_FLAG,
--- 1288,1294 ----
  enum options_table_type {
  	OPTIONS_TABLE_STRING,
  	OPTIONS_TABLE_NUMBER,
! 	OPTIONS_TABLE_KEY,
  	OPTIONS_TABLE_COLOUR,
  	OPTIONS_TABLE_ATTRIBUTES,
  	OPTIONS_TABLE_FLAG,
***************
*** 1413,1421 ****
  struct options_entry *options_set_number(
  	    struct options *, const char *, long long);
  long long options_get_number(struct options *, const char *);
- struct options_entry *options_set_data(
- 	    struct options *, const char *, void *, void (*)(void *));
- void   *options_get_data(struct options *, const char *);
  
  /* options-table.c */
  extern const struct options_table_entry server_options_table[];
--- 1407,1412 ----