From: tfheen <tfheen@8da78d58-1cd3-0310-bee5-d77bd1b3e8bf>
Date: Sun, 4 May 2003 20:10:54 +0000 (+0000)
Subject: merge stuff from idi
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abaa61e65572044abd4a3242c85acb1f88fed8d3;p=dotfiles

merge stuff from idi


git-svn-id: file:///svn/tfheen/trunk/dotfiles@140 8da78d58-1cd3-0310-bee5-d77bd1b3e8bf
---

diff --git a/Xclients-default b/Xclients-default
index 93814b1..128a8bd 100755
--- a/Xclients-default
+++ b/Xclients-default
@@ -7,12 +7,17 @@ if test "`uname -s`" = "SunOS" -a "$RUNNING_UNDER_BASH" = ""; then
     exec bash $0 "$@"
 fi
 
+if [ -f $HOME/.xsession-errors ]; then
+    exec > $HOME/.xsession-errors 2>&1
+    set -x
+fi
+
 # Debugging
 echo `date`
 . ~/.environment
 
 if [ -f ~/.Xdefaults ]; then
-	xrdb ~/.Xdefaults
+	xrdb -merge ~/.Xdefaults
 fi
 
 #xmodmap -e 'keycode 115 = less greater'
@@ -42,6 +47,7 @@ root-portal -n&
 
 xset r rate 250 50
 xset -b
+xset -c
 
 if type fvwm2; then
 	exec fvwm2