===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- src/usr.bin/tmux/tmux.c	2009/06/04 21:56:14	1.7
+++ src/usr.bin/tmux/tmux.c	2009/06/05 07:22:23	1.8
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.c,v 1.7 2009/06/04 21:56:14 nicm Exp $ */
+/* $OpenBSD: tmux.c,v 1.8 2009/06/05 07:22:23 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -326,12 +326,17 @@
 
 	if (!(flags & IDENTIFY_UTF8)) {
 		/*
-		 * If the user has set LANG to contain UTF-8, it is a safe
+		 * 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("LANG")) != NULL && strstr(s, "UTF-8") != NULL)
+		if ((s = getenv("LC_CTYPE")) == NULL) {
+			if ((s = getenv("LC_ALL")) == NULL)
+				s = getenv("LANG");
+		}
+		if (s != NULL && strcasestr(s, "UTF-8") != NULL)
 			flags |= IDENTIFY_UTF8;
 	}