===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty.c,v
retrieving revision 1.194
retrieving revision 1.195
diff -c -r1.194 -r1.195
*** src/usr.bin/tmux/tty.c	2015/11/18 14:27:44	1.194
--- src/usr.bin/tmux/tty.c	2015/11/23 20:53:09	1.195
***************
*** 1,4 ****
! /* $OpenBSD: tty.c,v 1.194 2015/11/18 14:27:44 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tty.c,v 1.195 2015/11/23 20:53:09 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 521,541 ****
  		}
  		tty->cstyle = s->cstyle;
  	}
! 	if (changed & (ALL_MOUSE_MODES|MODE_MOUSE_UTF8)) {
  		if (mode & ALL_MOUSE_MODES) {
  			/*
- 			 * Enable the UTF-8 (1005) extension if configured to.
  			 * Enable the SGR (1006) extension unconditionally, as
  			 * this is safe from misinterpretation. Do it in this
  			 * order, because in some terminals it's the last one
  			 * that takes effect and SGR is the preferred one.
  			 */
- 			if (mode & MODE_MOUSE_UTF8)
- 				tty_puts(tty, "\033[?1005h");
- 			else
- 				tty_puts(tty, "\033[?1005l");
  			tty_puts(tty, "\033[?1006h");
- 
  			if (mode & MODE_MOUSE_BUTTON)
  				tty_puts(tty, "\033[?1002h");
  			else if (mode & MODE_MOUSE_STANDARD)
--- 521,535 ----
  		}
  		tty->cstyle = s->cstyle;
  	}
! 	if (changed & ALL_MOUSE_MODES) {
  		if (mode & ALL_MOUSE_MODES) {
  			/*
  			 * Enable the SGR (1006) extension unconditionally, as
  			 * this is safe from misinterpretation. Do it in this
  			 * order, because in some terminals it's the last one
  			 * that takes effect and SGR is the preferred one.
  			 */
  			tty_puts(tty, "\033[?1006h");
  			if (mode & MODE_MOUSE_BUTTON)
  				tty_puts(tty, "\033[?1002h");
  			else if (mode & MODE_MOUSE_STANDARD)
***************
*** 545,554 ****
  				tty_puts(tty, "\033[?1002l");
  			else if (tty->mode & MODE_MOUSE_STANDARD)
  				tty_puts(tty, "\033[?1000l");
- 
  			tty_puts(tty, "\033[?1006l");
- 			if (tty->mode & MODE_MOUSE_UTF8)
- 				tty_puts(tty, "\033[?1005l");
  		}
  	}
  	if (changed & MODE_KKEYPAD) {
--- 539,545 ----