From f3d19cbbff69eb49f16969911f65717b4f06bd12 Mon Sep 17 00:00:00 2001
From: Stas Degteff <stas_degteff@users.sourceforge.net>
Date: Wed, 10 Nov 2010 05:40:30 +0000
Subject: [PATCH] Fix: accuracy locale settings

---
 bin/golded         | 4 ++--
 bin/screenrc_koi8r | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/golded b/bin/golded
index f0f2ab3..1743741 100644
--- a/bin/golded
+++ b/bin/golded
@@ -10,12 +10,12 @@ LUIT=`which luit`
 if [ -n $SCREEN ]; then
   CMD_UTF8="$SCREEN -c ${SCREENRC_GOLDED}"
 else if [ -n "$LUIT" ]; then
-       CMD_UTF8="$LUIT -x -encoding koi8-r -- $CMD"
+       CMD_UTF8="export LC_ALL="ru_RU.KOI8-R"; exec $LUIT -x -encoding koi8-r -- $CMD"
      else
        CMD_UTF8=$CMD
      fi
 fi
 
 echo "$LC_ALL $LC_CTYPE $LANG" | grep -q "ru_RU.UTF-8" \
- && (export LC_ALL="ru_RU.KOI8-R"; exec $CMD_UTF8) \
+ && ($CMD_UTF8) \
  || exec $CMD
diff --git a/bin/screenrc_koi8r b/bin/screenrc_koi8r
index 6cd66d2..a94dbbf 100644
--- a/bin/screenrc_koi8r
+++ b/bin/screenrc_koi8r
@@ -5,9 +5,9 @@
 # for parallel mail transfer
 
 startup_message off
-# Set default encoding for new windows
-defencoding koi8-r
 # Exec mailer in first window
 screen /bin/sh -c "binkd -c ~/fido/etc/binkd.conf"
+# Set default encoding for new windows
+defencoding koi8-r
 # Exec Golded+ in foreground window
 screen /bin/sh -c "LANG=ru_RU.KOI8-R gedlnx"