Merge branch 'obsd-master'

This commit is contained in:
Thomas Adam
2016-03-05 10:01:09 +00:00
4 changed files with 10 additions and 7 deletions

7
tmux.c
View File

@ -190,9 +190,12 @@ main(int argc, char **argv)
const char *s;
int opt, flags, keys;
setlocale(LC_CTYPE, "en_US.UTF-8");
setlocale(LC_TIME, "");
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();
if (**argv == '-')