===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.c,v
retrieving revision 1.123
retrieving revision 1.124
diff -c -r1.123 -r1.124
*** src/usr.bin/tmux/tmux.c	2013/10/10 12:03:22	1.123
--- src/usr.bin/tmux/tmux.c	2013/10/10 12:12:08	1.124
***************
*** 1,4 ****
! /* $OpenBSD: tmux.c,v 1.123 2013/10/10 12:03:22 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tmux.c,v 1.124 2013/10/10 12:12:08 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 261,277 ****
  	while ((opt = getopt(argc, argv, "2c:Cdf:lL:qS:uUv")) != -1) {
  		switch (opt) {
  		case '2':
! 			flags |= IDENTIFY_256COLOURS;
  			break;
  		case 'c':
  			free(shell_cmd);
  			shell_cmd = xstrdup(optarg);
  			break;
  		case 'C':
! 			if (flags & IDENTIFY_CONTROL)
! 				flags |= IDENTIFY_TERMIOS;
  			else
! 				flags |= IDENTIFY_CONTROL;
  			break;
  		case 'f':
  			free(cfg_file);
--- 261,277 ----
  	while ((opt = getopt(argc, argv, "2c:Cdf:lL:qS:uUv")) != -1) {
  		switch (opt) {
  		case '2':
! 			flags |= CLIENT_256COLOURS;
  			break;
  		case 'c':
  			free(shell_cmd);
  			shell_cmd = xstrdup(optarg);
  			break;
  		case 'C':
! 			if (flags & CLIENT_CONTROL)
! 				flags |= CLIENT_CONTROLCONTROL;
  			else
! 				flags |= CLIENT_CONTROL;
  			break;
  		case 'f':
  			free(cfg_file);
***************
*** 292,298 ****
  			path = xstrdup(optarg);
  			break;
  		case 'u':
! 			flags |= IDENTIFY_UTF8;
  			break;
  		case 'v':
  			debug_level++;
--- 292,298 ----
  			path = xstrdup(optarg);
  			break;
  		case 'u':
! 			flags |= CLIENT_UTF8;
  			break;
  		case 'v':
  			debug_level++;
***************
*** 307,313 ****
  	if (shell_cmd != NULL && argc != 0)
  		usage();
  
! 	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
--- 307,313 ----
  	if (shell_cmd != NULL && argc != 0)
  		usage();
  
! 	if (!(flags & CLIENT_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
***************
*** 321,327 ****
  		}
  		if (s != NULL && (strcasestr(s, "UTF-8") != NULL ||
  		    strcasestr(s, "UTF8") != NULL))
! 			flags |= IDENTIFY_UTF8;
  	}
  
  	environ_init(&global_environ);
--- 321,327 ----
  		}
  		if (s != NULL && (strcasestr(s, "UTF-8") != NULL ||
  		    strcasestr(s, "UTF8") != NULL))
! 			flags |= CLIENT_UTF8;
  	}
  
  	environ_init(&global_environ);
***************
*** 340,346 ****
  	options_table_populate_tree(window_options_table, &global_w_options);
  
  	/* Enable UTF-8 if the first client is on UTF-8 terminal. */
! 	if (flags & IDENTIFY_UTF8) {
  		options_set_number(&global_s_options, "status-utf8", 1);
  		options_set_number(&global_s_options, "mouse-utf8", 1);
  		options_set_number(&global_w_options, "utf8", 1);
--- 340,346 ----
  	options_table_populate_tree(window_options_table, &global_w_options);
  
  	/* Enable UTF-8 if the first client is on UTF-8 terminal. */
! 	if (flags & CLIENT_UTF8) {
  		options_set_number(&global_s_options, "status-utf8", 1);
  		options_set_number(&global_s_options, "mouse-utf8", 1);
  		options_set_number(&global_w_options, "utf8", 1);