===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-client.c,v
retrieving revision 1.166
retrieving revision 1.167
diff -c -r1.166 -r1.167
*** src/usr.bin/tmux/server-client.c	2015/10/31 13:12:03	1.166
--- src/usr.bin/tmux/server-client.c	2015/11/11 23:23:33	1.167
***************
*** 1,4 ****
! /* $OpenBSD: server-client.c,v 1.166 2015/10/31 13:12:03 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: server-client.c,v 1.167 2015/11/11 23:23:33 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 801,814 ****
  		mode = (mode & ~ALL_MOUSE_MODES) | MODE_MOUSE_BUTTON;
  
  	/*
! 	 * Set UTF-8 mouse input if required. If the terminal is UTF-8, the
! 	 * user has set mouse-utf8 and any mouse mode is in effect, turn on
! 	 * UTF-8 mouse input. If the receiving terminal hasn't requested it
! 	 * (that is, it isn't in s->mode), then it'll be converted in
! 	 * input_mouse.
  	 */
! 	if ((c->tty.flags & TTY_UTF8) &&
! 	    (mode & ALL_MOUSE_MODES) && options_get_number(oo, "mouse-utf8"))
  		mode |= MODE_MOUSE_UTF8;
  	else
  		mode &= ~MODE_MOUSE_UTF8;
--- 801,812 ----
  		mode = (mode & ~ALL_MOUSE_MODES) | MODE_MOUSE_BUTTON;
  
  	/*
! 	 * Set UTF-8 mouse input if required. If the terminal is UTF-8 and any
! 	 * mouse mode is in effect, turn on UTF-8 mouse input. If the receiving
! 	 * terminal hasn't requested it (that is, it isn't in s->mode), then
! 	 * it'll be converted in input_mouse.
  	 */
! 	if ((c->tty.flags & TTY_UTF8) && (mode & ALL_MOUSE_MODES))
  		mode |= MODE_MOUSE_UTF8;
  	else
  		mode &= ~MODE_MOUSE_UTF8;