===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.379
retrieving revision 1.380
diff -c -r1.379 -r1.380
*** src/usr.bin/tmux/tmux.h	2013/03/21 16:15:52	1.379
--- src/usr.bin/tmux/tmux.h	2013/03/21 16:19:25	1.380
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.379 2013/03/21 16:15:52 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.380 2013/03/21 16:19:25 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 1724,1730 ****
  		     struct cmd_ctx *, const char *, struct session **);
  struct winlink	*cmd_find_pane(struct cmd_ctx *,
  		     const char *, struct session **, struct window_pane **);
! char		*cmd_template_replace(char *, const char *, int);
  const char     	*cmd_get_default_path(struct cmd_ctx *, const char *);
  extern const struct cmd_entry *cmd_table[];
  extern const struct cmd_entry cmd_attach_session_entry;
--- 1724,1730 ----
  		     struct cmd_ctx *, const char *, struct session **);
  struct winlink	*cmd_find_pane(struct cmd_ctx *,
  		     const char *, struct session **, struct window_pane **);
! char		*cmd_template_replace(const char *, const char *, int);
  const char     	*cmd_get_default_path(struct cmd_ctx *, const char *);
  extern const struct cmd_entry *cmd_table[];
  extern const struct cmd_entry cmd_attach_session_entry;
***************
*** 2208,2220 ****
  void	window_choose_data_run(struct window_choose_data *);
  struct window_choose_data	*window_choose_add_window(struct window_pane *,
  			struct client *, struct session *, struct winlink *,
! 			const char *, char *, u_int);
  struct window_choose_data	*window_choose_add_session(struct window_pane *,
  			struct client *, struct session *, const char *,
! 			char *, u_int);
  struct window_choose_data	*window_choose_add_item(struct window_pane *,
  			struct client *, struct winlink *, const char *,
! 			char *, u_int);
  void	window_choose_expand_all(struct window_pane *);
  
  /* names.c */
--- 2208,2220 ----
  void	window_choose_data_run(struct window_choose_data *);
  struct window_choose_data	*window_choose_add_window(struct window_pane *,
  			struct client *, struct session *, struct winlink *,
! 			const char *, const char *, u_int);
  struct window_choose_data	*window_choose_add_session(struct window_pane *,
  			struct client *, struct session *, const char *,
! 			const char *, u_int);
  struct window_choose_data	*window_choose_add_item(struct window_pane *,
  			struct client *, struct winlink *, const char *,
! 			const char *, u_int);
  void	window_choose_expand_all(struct window_pane *);
  
  /* names.c */