Drop mouse-utf8 option and always turn on UTF-8 mouse if the client says

it supports UTF-8.

1 files changed, 5 insertions, 7 deletions

diff --git a/server-client.c b/server-client.c
index f1e2deff..521f2737 100644
--- a/server-client.c
+++ b/server-client.c
@@ -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;