===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.260
retrieving revision 1.261
diff -c -r1.260 -r1.261
*** src/usr.bin/tmux/tmux.h	2011/01/01 03:32:28	1.260
--- src/usr.bin/tmux/tmux.h	2011/01/01 03:39:21	1.261
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.260 2011/01/01 03:32:28 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.261 2011/01/01 03:39:21 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 534,543 ****
  
  /* Named mode key table description. */
  struct mode_key_table {
! 	const char		*name;
! 	struct mode_key_cmdstr	*cmdstr;
! 	struct mode_key_tree	*tree;
! 	const struct mode_key_entry *table;	/* default entries */
  };
  
  /* Modes. */
--- 534,543 ----
  
  /* Named mode key table description. */
  struct mode_key_table {
! 	const char			*name;
! 	const struct mode_key_cmdstr	*cmdstr;
! 	struct mode_key_tree		*tree;
! 	const struct mode_key_entry	*table;	/* default entries */
  };
  
  /* Modes. */
***************
*** 1329,1336 ****
  extern struct mode_key_tree mode_key_tree_emacs_copy;
  int	mode_key_cmp(struct mode_key_binding *, struct mode_key_binding *);
  SPLAY_PROTOTYPE(mode_key_tree, mode_key_binding, entry, mode_key_cmp);
! const char *mode_key_tostring(struct mode_key_cmdstr *r, enum mode_key_cmd);
! enum mode_key_cmd mode_key_fromstring(struct mode_key_cmdstr *, const char *);
  const struct mode_key_table *mode_key_findtable(const char *);
  void	mode_key_init_trees(void);
  void	mode_key_init(struct mode_key_data *, struct mode_key_tree *);
--- 1329,1338 ----
  extern struct mode_key_tree mode_key_tree_emacs_copy;
  int	mode_key_cmp(struct mode_key_binding *, struct mode_key_binding *);
  SPLAY_PROTOTYPE(mode_key_tree, mode_key_binding, entry, mode_key_cmp);
! const char *mode_key_tostring(const struct mode_key_cmdstr *,
! 	    enum mode_key_cmd);
! enum mode_key_cmd mode_key_fromstring(const struct mode_key_cmdstr *,
! 	    const char *);
  const struct mode_key_table *mode_key_findtable(const char *);
  void	mode_key_init_trees(void);
  void	mode_key_init(struct mode_key_data *, struct mode_key_tree *);