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 93814b1db39f4a8be257bfb88dbce89e13becef5..128a8bd73cb51bdbb0fa4955c57200f9885eab0a 100755 (executable)
--- 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