===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.621
retrieving revision 1.622
diff -c -r1.621 -r1.622
*** src/usr.bin/tmux/tmux.h	2016/03/01 12:02:08	1.621
--- src/usr.bin/tmux/tmux.h	2016/03/02 15:36:02	1.622
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.621 2016/03/01 12:02:08 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.622 2016/03/02 15:36:02 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 2316,2323 ****
  void		 utf8_copy(struct utf8_data *, const struct utf8_data *);
  enum utf8_state	 utf8_open(struct utf8_data *, u_char);
  enum utf8_state	 utf8_append(struct utf8_data *, u_char);
! u_int		 utf8_width(wchar_t);
! wchar_t		 utf8_combine(const struct utf8_data *);
  enum utf8_state	 utf8_split(wchar_t, struct utf8_data *);
  int		 utf8_strvis(char *, const char *, size_t, int);
  char		*utf8_sanitize(const char *);
--- 2316,2322 ----
  void		 utf8_copy(struct utf8_data *, const struct utf8_data *);
  enum utf8_state	 utf8_open(struct utf8_data *, u_char);
  enum utf8_state	 utf8_append(struct utf8_data *, u_char);
! enum utf8_state	 utf8_combine(const struct utf8_data *, wchar_t *);
  enum utf8_state	 utf8_split(wchar_t, struct utf8_data *);
  int		 utf8_strvis(char *, const char *, size_t, int);
  char		*utf8_sanitize(const char *);