===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.c,v
retrieving revision 1.167
retrieving revision 1.168
diff -c -r1.167 -r1.168
*** src/usr.bin/tmux/tmux.c	2016/03/05 07:44:31	1.167
--- src/usr.bin/tmux/tmux.c	2016/03/05 16:08:38	1.168
***************
*** 1,4 ****
! /* $OpenBSD: tmux.c,v 1.167 2016/03/05 07:44:31 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: tmux.c,v 1.168 2016/03/05 16:08:38 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 24,29 ****
--- 24,30 ----
  #include <event.h>
  #include <fcntl.h>
  #include <getopt.h>
+ #include <langinfo.h>
  #include <locale.h>
  #include <paths.h>
  #include <pwd.h>
***************
*** 188,197 ****
  	const char	*s;
  	int		 opt, flags, keys;
  
! 	if (setlocale(LC_CTYPE, "en_US.UTF-8") == NULL)
! 		setlocale(LC_CTYPE, "");
! 	if (wcwidth(0xfffd) != 1)
! 		errx(1, "no UTF-8 locale; please set LC_CTYPE");
  
  	setlocale(LC_TIME, "");
  	tzset();
--- 189,202 ----
  	const char	*s;
  	int		 opt, flags, keys;
  
! 	if (setlocale(LC_CTYPE, "en_US.UTF-8") == NULL) {
! 		if (setlocale(LC_CTYPE, "") == NULL)
! 			errx(1, "invalid LC_ALL, LC_CTYPE or LANG");
! 		s = nl_langinfo(CODESET);
! 		if (strcasecmp(s, "UTF-8") != 0 &&
! 		    strcasecmp(s, "UTF8") != 0)
! 			errx(1, "need UTF-8 locale (LC_CTYPE) but have %s", s);
! 	}
  
  	setlocale(LC_TIME, "");
  	tzset();