summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/server-client.c
diff options
context:
space:
mode:
Diffstat (limited to 'usr.bin/tmux/server-client.c')
-rw-r--r--usr.bin/tmux/server-client.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/usr.bin/tmux/server-client.c b/usr.bin/tmux/server-client.c
index 4e3fe2af15c..1639c3f26b3 100644
--- a/usr.bin/tmux/server-client.c
+++ b/usr.bin/tmux/server-client.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: server-client.c,v 1.166 2015/10/31 13:12:03 nicm Exp $ */
+/* $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,14 +801,12 @@ server_client_reset_state(struct client *c)
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.
+ * 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) && options_get_number(oo, "mouse-utf8"))
+ if ((c->tty.flags & TTY_UTF8) && (mode & ALL_MOUSE_MODES))
mode |= MODE_MOUSE_UTF8;
else
mode &= ~MODE_MOUSE_UTF8;