From f9abbc44d34f5a7ddba5d8dfdcd46d710b71d93d Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Tue, 23 Jun 2009 18:27:41 +0000 Subject: LC_ALL overrides LC_CTYPE and LANG. Comment was correct but the code wrong. Pointed out by Hannah Schroeter, thanks. --- usr.bin/tmux/tmux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'usr.bin') diff --git a/usr.bin/tmux/tmux.c b/usr.bin/tmux/tmux.c index a6b4df134e6..671b6999c91 100644 --- a/usr.bin/tmux/tmux.c +++ b/usr.bin/tmux/tmux.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tmux.c,v 1.8 2009/06/05 07:22:23 nicm Exp $ */ +/* $OpenBSD: tmux.c,v 1.9 2009/06/23 18:27:40 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -332,8 +332,8 @@ main(int argc, char **argv) * if not they know that output from UTF-8-capable programs may * be wrong. */ - if ((s = getenv("LC_CTYPE")) == NULL) { - if ((s = getenv("LC_ALL")) == NULL) + if ((s = getenv("LC_ALL")) == NULL) { + if ((s = getenv("LC_CTYPE")) == NULL) s = getenv("LANG"); } if (s != NULL && strcasestr(s, "UTF-8") != NULL) -- cgit v1.2.3