===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.416
retrieving revision 1.417
diff -c -r1.416 -r1.417
*** src/usr.bin/tmux/tmux.h	2013/10/10 11:45:29	1.416
--- src/usr.bin/tmux/tmux.h	2013/10/10 11:56:50	1.417
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.416 2013/10/10 11:45:29 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.417 2013/10/10 11:56:50 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 1552,1567 ****
  RB_PROTOTYPE(format_tree, format_entry, entry, format_cmp);
  struct format_tree *format_create(void);
  void		 format_free(struct format_tree *);
! void printflike3 format_add(
! 		     struct format_tree *, const char *, const char *, ...);
  const char	*format_find(struct format_tree *, const char *);
  char		*format_expand(struct format_tree *, const char *);
  void		 format_session(struct format_tree *, struct session *);
  void		 format_client(struct format_tree *, struct client *);
! void		 format_winlink(
! 		     struct format_tree *, struct session *, struct winlink *);
! void		 format_window_pane(struct format_tree *, struct window_pane *);
! void		 format_paste_buffer(struct format_tree *, struct paste_buffer *);
  
  /* mode-key.c */
  extern const struct mode_key_table mode_key_tables[];
--- 1552,1570 ----
  RB_PROTOTYPE(format_tree, format_entry, entry, format_cmp);
  struct format_tree *format_create(void);
  void		 format_free(struct format_tree *);
! void printflike3 format_add(struct format_tree *, const char *, const char *,
! 		     ...);
  const char	*format_find(struct format_tree *, const char *);
  char		*format_expand(struct format_tree *, const char *);
  void		 format_session(struct format_tree *, struct session *);
  void		 format_client(struct format_tree *, struct client *);
! void		 format_window(struct format_tree *, struct window *);
! void		 format_winlink(struct format_tree *, struct session *,
! 		     struct winlink *);
! void		 format_window_pane(struct format_tree *,
! 		     struct window_pane *);
! void		 format_paste_buffer(struct format_tree *,
! 		     struct paste_buffer *);
  
  /* mode-key.c */
  extern const struct mode_key_table mode_key_tables[];
***************
*** 2275,2282 ****
  void	window_choose_set_current(struct window_pane *, u_int);
  
  /* names.c */
! void		 queue_window_name(struct window *);
! char		*default_window_name(struct window *);
  
  /* signal.c */
  void	set_signals(void(*)(int, short, void *));
--- 2278,2287 ----
  void	window_choose_set_current(struct window_pane *, u_int);
  
  /* names.c */
! void	 queue_window_name(struct window *);
! char	*default_window_name(struct window *);
! char	*format_window_name(struct window *);
! char	*parse_window_name(const char *);
  
  /* signal.c */
  void	set_signals(void(*)(int, short, void *));