[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.14 and 1.15

version 1.14, 2009/07/10 05:50:54 version 1.15, 2009/07/17 13:38:03
Line 266 
Line 266 
         log_open_tty(debug_level);          log_open_tty(debug_level);
         siginit();          siginit();
   
           if (!(flags & IDENTIFY_UTF8)) {
                   /*
                    * If the user has set whichever of LC_ALL, LC_CTYPE or LANG
                    * exist (in that order) to contain UTF-8, it is a safe
                    * assumption that either they are using a UTF-8 terminal, or
                    * if not they know that output from UTF-8-capable programs may
                    * be wrong.
                    */
                   if ((s = getenv("LC_ALL")) == NULL) {
                           if ((s = getenv("LC_CTYPE")) == NULL)
                                   s = getenv("LANG");
                   }
                   if (s != NULL && strcasestr(s, "UTF-8") != NULL)
                           flags |= IDENTIFY_UTF8;
           }
   
         options_init(&global_s_options, NULL);          options_init(&global_s_options, NULL);
         options_set_number(&global_s_options, "bell-action", BELL_ANY);          options_set_number(&global_s_options, "bell-action", BELL_ANY);
         options_set_number(&global_s_options, "buffer-limit", 9);          options_set_number(&global_s_options, "buffer-limit", 9);
Line 292 
Line 308 
         options_set_string(&global_s_options, "status-left", "[#S]");          options_set_string(&global_s_options, "status-left", "[#S]");
         options_set_string(          options_set_string(
             &global_s_options, "status-right", "\"#24T\" %%H:%%M %%d-%%b-%%y");              &global_s_options, "status-right", "\"#24T\" %%H:%%M %%d-%%b-%%y");
         options_set_number(&global_s_options, "status-utf8", 0);          if (flags & IDENTIFY_UTF8)
                   options_set_number(&global_s_options, "status-utf8", 1);
           else
                   options_set_number(&global_s_options, "status-utf8", 0);
   
         options_init(&global_w_options, NULL);          options_init(&global_w_options, NULL);
         options_set_number(&global_w_options, "aggressive-resize", 0);          options_set_number(&global_w_options, "aggressive-resize", 0);
Line 309 
Line 328 
         options_set_number(&global_w_options, "mode-keys", MODEKEY_EMACS);          options_set_number(&global_w_options, "mode-keys", MODEKEY_EMACS);
         options_set_number(&global_w_options, "monitor-activity", 0);          options_set_number(&global_w_options, "monitor-activity", 0);
         options_set_string(&global_w_options, "monitor-content", "%s", "");          options_set_string(&global_w_options, "monitor-content", "%s", "");
         options_set_number(&global_w_options, "utf8", 0);          if (flags & IDENTIFY_UTF8)
                   options_set_number(&global_w_options, "utf8", 1);
           else
                   options_set_number(&global_w_options, "utf8", 0);
         options_set_number(&global_w_options, "window-status-attr", 0);          options_set_number(&global_w_options, "window-status-attr", 0);
         options_set_number(&global_w_options, "window-status-bg", 8);          options_set_number(&global_w_options, "window-status-bg", 8);
         options_set_number(&global_w_options, "window-status-fg", 8);          options_set_number(&global_w_options, "window-status-fg", 8);
         options_set_number(&global_w_options, "xterm-keys", 0);          options_set_number(&global_w_options, "xterm-keys", 0);
         options_set_number(&global_w_options, "remain-on-exit", 0);          options_set_number(&global_w_options, "remain-on-exit", 0);
   
         if (!(flags & IDENTIFY_UTF8)) {  
                 /*  
                  * If the user has set whichever of LC_ALL, LC_CTYPE or LANG  
                  * exist (in that order) to contain UTF-8, it is a safe  
                  * assumption that either they are using a UTF-8 terminal, or  
                  * if not they know that output from UTF-8-capable programs may  
                  * be wrong.  
                  */  
                 if ((s = getenv("LC_ALL")) == NULL) {  
                         if ((s = getenv("LC_CTYPE")) == NULL)  
                                 s = getenv("LANG");  
                 }  
                 if (s != NULL && strcasestr(s, "UTF-8") != NULL)  
                         flags |= IDENTIFY_UTF8;  
         }  
   
         if (cfg_file == NULL) {          if (cfg_file == NULL) {
                 home = getenv("HOME");                  home = getenv("HOME");

Legend:
Removed from v.1.14  
changed lines
  Added in v.1.15