===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.579
retrieving revision 1.580
diff -c -r1.579 -r1.580
*** src/usr.bin/tmux/tmux.h	2015/11/14 11:45:43	1.579
--- src/usr.bin/tmux/tmux.h	2015/11/15 22:50:38	1.580
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.579 2015/11/14 11:45:43 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.580 2015/11/15 22:50:38 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 58,69 ****
  #define NAME_INTERVAL 500000
  
  /*
-  * UTF-8 data size. This must be big enough to hold combined characters as well
-  * as single.
-  */
- #define UTF8_SIZE 9
- 
- /*
   * READ_SIZE is the maximum size of data to hold from a pty (the event high
   * watermark). READ_BACKOFF is the amount of data waiting to be output to a tty
   * before pty reads will be backed off. READ_TIME is how long to back off
--- 58,63 ----
***************
*** 125,131 ****
   * A single key. This can be ASCII or Unicode or one of the keys starting at
   * KEYC_BASE.
   */
! typedef uint64_t key_code;
  
  /* Special key codes. */
  enum {
--- 119,125 ----
   * A single key. This can be ASCII or Unicode or one of the keys starting at
   * KEYC_BASE.
   */
! typedef unsigned long long key_code;
  
  /* Special key codes. */
  enum {
***************
*** 617,623 ****
  
  #define ALL_MOUSE_MODES (MODE_MOUSE_STANDARD|MODE_MOUSE_BUTTON)
  
! /* A single UTF-8 character. */
  struct utf8_data {
  	u_char	data[UTF8_SIZE];
  
--- 611,621 ----
  
  #define ALL_MOUSE_MODES (MODE_MOUSE_STANDARD|MODE_MOUSE_BUTTON)
  
! /*
!  * A single UTF-8 character. UTF8_SIZE must be big enough to hold at least one
!  * combining character as well.
! */
! #define UTF8_SIZE 9
  struct utf8_data {
  	u_char	data[UTF8_SIZE];