===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.508
retrieving revision 1.509
diff -c -r1.508 -r1.509
*** src/usr.bin/tmux/tmux.h	2015/05/08 16:23:34	1.508
--- src/usr.bin/tmux/tmux.h	2015/05/08 16:33:29	1.509
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.508 2015/05/08 16:23:34 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.509 2015/05/08 16:33:29 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 566,585 ****
  	MODEKEYCOPY_UP,
  };
  
- /* Entry in the default mode key tables. */
- struct mode_key_entry {
- 	int			key;
- 
- 	/*
- 	 * Editing mode for vi: 0 is edit mode, keys not in the table are
- 	 * returned as MODEKEY_OTHER; 1 is command mode, keys not in the table
- 	 * are returned as MODEKEY_NONE. This is also matched on, allowing some
- 	 * keys to be bound in edit mode.
- 	 */
- 	int			mode;
- 	enum mode_key_cmd	cmd;
- };
- 
  /* Data required while mode keys are in use. */
  struct mode_key_data {
  	struct mode_key_tree   *tree;
--- 566,571 ----
***************
*** 607,612 ****
--- 593,599 ----
  };
  
  /* Named mode key table description. */
+ struct mode_key_entry;
  struct mode_key_table {
  	const char			*name;
  	const struct mode_key_cmdstr	*cmdstr;
***************
*** 1192,1207 ****
  
  /* Saved message entry. */
  struct message_entry {
! 	char   *msg;
! 	u_int	msg_num;
! 	time_t	msg_time;
  	TAILQ_ENTRY(message_entry) entry;
  };
  
  /* Status output data from a job. */
  struct status_out {
! 	char   *cmd;
! 	char   *out;
  
  	RB_ENTRY(status_out) entry;
  };
--- 1179,1194 ----
  
  /* Saved message entry. */
  struct message_entry {
! 	char	*msg;
! 	u_int	 msg_num;
! 	time_t	 msg_time;
  	TAILQ_ENTRY(message_entry) entry;
  };
  
  /* Status output data from a job. */
  struct status_out {
! 	char	*cmd;
! 	char	*out;
  
  	RB_ENTRY(status_out) entry;
  };
***************
*** 1322,1327 ****
--- 1309,1315 ----
  
  	TAILQ_ENTRY(cmd)	 qentry;
  };
+ 
  struct cmd_list {
  	int		 	 references;
  	TAILQ_HEAD(, cmd) 	 list;
***************
*** 1394,1399 ****
--- 1382,1388 ----
  	RB_ENTRY(key_binding)	 entry;
  };
  RB_HEAD(key_bindings, key_binding);
+ 
  struct key_table {
  	const char		 *name;
  	struct key_bindings	 key_bindings;