===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.446
retrieving revision 1.447
diff -c -r1.446 -r1.447
*** src/usr.bin/tmux/tmux.h	2014/04/01 05:50:30	1.446
--- src/usr.bin/tmux/tmux.h	2014/04/02 18:12:18	1.447
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.446 2014/04/01 05:50:30 deraadt Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.447 2014/04/02 18:12:18 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 85,91 ****
  
  /* Default template for choose-buffer. */
  #define CHOOSE_BUFFER_TEMPLATE					\
! 	"#{line}: #{buffer_size} bytes: \"#{buffer_sample}\""
  
  /* Default template for choose-client. */
  #define CHOOSE_CLIENT_TEMPLATE					\
--- 85,91 ----
  
  /* Default template for choose-buffer. */
  #define CHOOSE_BUFFER_TEMPLATE					\
! 	"#{line}: #{buffer_size} bytes: #{buffer_sample}"
  
  /* Default template for choose-client. */
  #define CHOOSE_CLIENT_TEMPLATE					\
***************
*** 1544,1550 ****
  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[];
--- 1544,1550 ----
  void		 format_window_pane(struct format_tree *,
  		     struct window_pane *);
  void		 format_paste_buffer(struct format_tree *,
! 		     struct paste_buffer *, int);
  
  /* mode-key.c */
  extern const struct mode_key_table mode_key_tables[];
***************
*** 1714,1720 ****
  int		 paste_free_index(struct paste_stack *, u_int);
  void		 paste_add(struct paste_stack *, char *, size_t, u_int);
  int		 paste_replace(struct paste_stack *, u_int, char *, size_t);
! char		*paste_print(struct paste_buffer *, size_t);
  void		 paste_send_pane(struct paste_buffer *, struct window_pane *,
  		     const char *, int);
  
--- 1714,1720 ----
  int		 paste_free_index(struct paste_stack *, u_int);
  void		 paste_add(struct paste_stack *, char *, size_t, u_int);
  int		 paste_replace(struct paste_stack *, u_int, char *, size_t);
! char		*paste_make_sample(struct paste_buffer *, int);
  void		 paste_send_pane(struct paste_buffer *, struct window_pane *,
  		     const char *, int);
  
***************
*** 2326,2331 ****
--- 2326,2332 ----
  int	utf8_append(struct utf8_data *, u_char);
  u_int	utf8_combine(const struct utf8_data *);
  u_int	utf8_split2(u_int, u_char *);
+ int	utf8_strvis(char *, const char *, size_t, int);
  
  /* procname.c */
  char   *get_proc_name(int, char *);