From: nicm <nicm@openbsd.org>
Date: Thu, 9 Aug 2018 09:53:44 +0000 (+0000)
Subject: Bump the UTF-8 character array up to 18 to allow for more combining
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=738a276adba55e71621c07cc308d6d9aa0525f7a;p=openbsd

Bump the UTF-8 character array up to 18 to allow for more combining
characters (some languages use up to five). This size doesn't make as
much difference now that UTF-8 goes into an extended cell. GitHub issue
1430.
---

diff --git a/usr.bin/tmux/Makefile b/usr.bin/tmux/Makefile
index 7742621e219..355a07f373e 100644
--- a/usr.bin/tmux/Makefile
+++ b/usr.bin/tmux/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.89 2017/07/12 09:24:17 nicm Exp $
+# $OpenBSD: Makefile,v 1.90 2018/08/09 09:53:44 nicm Exp $
 
 PROG=	tmux
 SRCS=	alerts.c \
@@ -122,7 +122,7 @@ SRCS=	alerts.c \
 CDIAGFLAGS+= -Wno-long-long -Wall -W -Wnested-externs -Wformat=2
 CDIAGFLAGS+= -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations
 CDIAGFLAGS+= -Wwrite-strings -Wshadow -Wpointer-arith -Wsign-compare
-CDIAGFLAGS+= -Wundef -Wbad-function-cast -Winline -Wcast-align
+CDIAGFLAGS+= -Wundef -Wbad-function-cast -Winline -Wcast-align -Wunused
 
 LDADD=  -lutil -lcurses -levent
 DPADD=  ${LIBUTIL} ${LIBCURSES} ${LIBEVENT}
diff --git a/usr.bin/tmux/tmux.h b/usr.bin/tmux/tmux.h
index 0ca227a317c..8f297a492dc 100644
--- a/usr.bin/tmux/tmux.h
+++ b/usr.bin/tmux/tmux.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.836 2018/08/02 18:35:21 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.837 2018/08/09 09:53:44 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -511,10 +511,11 @@ struct msg_stderr_data {
 #define ALL_MOUSE_MODES (MODE_MOUSE_STANDARD|MODE_MOUSE_BUTTON|MODE_MOUSE_ALL)
 
 /*
- * A single UTF-8 character. UTF8_SIZE must be big enough to hold at least one
- * combining character as well.
+ * A single UTF-8 character. UTF8_SIZE must be big enough to hold
+ * combining characters as well, currently at most five (of three
+ * bytes) are supported.
 */
-#define UTF8_SIZE 9
+#define UTF8_SIZE 18
 struct utf8_data {
 	u_char	data[UTF8_SIZE];