===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -c -r1.14 -r1.15
*** src/usr.bin/tmux/tmux.c	2009/07/10 05:50:54	1.14
--- src/usr.bin/tmux/tmux.c	2009/07/17 13:38:03	1.15
***************
*** 1,4 ****
! /* $OpenBSD: tmux.c,v 1.14 2009/07/10 05:50:54 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tmux.c,v 1.15 2009/07/17 13:38:03 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 266,271 ****
--- 266,287 ----
  	log_open_tty(debug_level);
  	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_set_number(&global_s_options, "bell-action", BELL_ANY);
  	options_set_number(&global_s_options, "buffer-limit", 9);
***************
*** 292,298 ****
  	options_set_string(&global_s_options, "status-left", "[#S]");
  	options_set_string(
  	    &global_s_options, "status-right", "\"#24T\" %%H:%%M %%d-%%b-%%y");
! 	options_set_number(&global_s_options, "status-utf8", 0);
  
  	options_init(&global_w_options, NULL);
  	options_set_number(&global_w_options, "aggressive-resize", 0);
--- 308,317 ----
  	options_set_string(&global_s_options, "status-left", "[#S]");
  	options_set_string(
  	    &global_s_options, "status-right", "\"#24T\" %%H:%%M %%d-%%b-%%y");
! 	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_set_number(&global_w_options, "aggressive-resize", 0);
***************
*** 309,336 ****
  	options_set_number(&global_w_options, "mode-keys", MODEKEY_EMACS);
  	options_set_number(&global_w_options, "monitor-activity", 0);
  	options_set_string(&global_w_options, "monitor-content", "%s", "");
! 	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-bg", 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, "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) {
  		home = getenv("HOME");
--- 328,342 ----
  	options_set_number(&global_w_options, "mode-keys", MODEKEY_EMACS);
  	options_set_number(&global_w_options, "monitor-activity", 0);
  	options_set_string(&global_w_options, "monitor-content", "%s", "");
! 	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-bg", 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, "remain-on-exit", 0);
  
  	if (cfg_file == NULL) {
  		home = getenv("HOME");