From 162e2229a9fec492d8c7dcfaa11f66dd3bc2930c Mon Sep 17 00:00:00 2001
From: Simon Ruderich <simon@ruderich.org>
Date: Mon, 27 May 2013 12:43:14 +0200
Subject: [PATCH] xinitrc: Load general shell environment from ~/.shell/env.

---
 xinitrc | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/xinitrc b/xinitrc
index 8a634ff..696230a 100755
--- a/xinitrc
+++ b/xinitrc
@@ -21,10 +21,17 @@
 # Some systems don't set the LANG environment variable when starting xinitrc,
 # this causes problems for rxvt-unicode-256color which fails to display UTF-8
 # characters correctly when LANG is missing and for notify.py which also needs
-# LANG set (for Python's decode() function). Therefore set it here, might be
-# overwritten by shell setup scripts.
-LANG=en_US.UTF-8
-export LANG
+# LANG set (for Python's decode() function). Therefore load my general shell
+# environment which also includes $LANG.
+if test -f "$HOME/.shell/env"; then
+    # Debug function used in ~/.shell/env.
+    source_debug() {
+        # Do nothing.
+        :
+    }
+
+    . "$HOME/.shell/env"
+fi
 
 
 installed() {
-- 
2.44.1