[BACK]Return to tmux.c CVS log [TXT][DIR] Up to [local] / src / usr.bin / tmux

Diff for /src/usr.bin/tmux/tmux.c between version 1.167 and 1.168

version 1.167, 2016/03/05 07:44:31 version 1.168, 2016/03/05 16:08:38
Line 24 
Line 24 
 #include <event.h>  #include <event.h>
 #include <fcntl.h>  #include <fcntl.h>
 #include <getopt.h>  #include <getopt.h>
   #include <langinfo.h>
 #include <locale.h>  #include <locale.h>
 #include <paths.h>  #include <paths.h>
 #include <pwd.h>  #include <pwd.h>
Line 188 
Line 189 
         const char      *s;          const char      *s;
         int              opt, flags, keys;          int              opt, flags, keys;
   
         if (setlocale(LC_CTYPE, "en_US.UTF-8") == NULL)          if (setlocale(LC_CTYPE, "en_US.UTF-8") == NULL) {
                 setlocale(LC_CTYPE, "");                  if (setlocale(LC_CTYPE, "") == NULL)
         if (wcwidth(0xfffd) != 1)                          errx(1, "invalid LC_ALL, LC_CTYPE or LANG");
                 errx(1, "no UTF-8 locale; please set LC_CTYPE");                  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, "");          setlocale(LC_TIME, "");
         tzset();          tzset();

Legend:
Removed from v.1.167  
changed lines
  Added in v.1.168