From cd5a4f4c3586eac9c1a4ba7c962cec16fc92dd08 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Thu, 25 Jun 2009 16:00:02 +0000 Subject: [PATCH] LC_ALL overrides LC_CTYPE and LANG. Comment was correct but the code wrong. Pointed out by Hannah Schroeter, thanks. --- tmux.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tmux.c b/tmux.c index 0f04cfa2..4e5ef9fa 100644 --- a/tmux.c +++ b/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 @@ -348,8 +348,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)