# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1402987447 14400
# Node ID 431128b5fa0c319c0d6f44037ac1ca7d5de134e7
# Parent  1c1237f8b9e33d340733312b9315932827650e10# Parent  b33d2188bfb9f8888e7c17879850b5b475505f7b
Merge from default

diff --git a/.Xdefaults b/.Xdefaults
--- a/.Xdefaults
+++ b/.Xdefaults
@@ -12,7 +12,9 @@ URxvt.urgentOnBell: true
 
 URxvt.saveLines: 1000
 
-URxvt.iso14755: false
+! keep LCtrl+LShift+[0-9a-f] unicode insertion
+URxvt.iso14755: true
+! disable LCtrl+LShift+keycap symbolic unicode (use Compose key instead)
 URxvt.iso14755_52: false
 
 #ifdef USE_LOCAL
diff --git a/.i3/auto-start b/.i3/auto-start
diff --git a/.i3/config b/.i3/config
diff --git a/.i3status.conf b/.i3status.conf
diff --git a/.xsessionrc b/.xsessionrc
--- a/.xsessionrc
+++ b/.xsessionrc
@@ -22,7 +22,7 @@ fi
 /usr/bin/xmodmap ~/.xmodmaprc
 
 if [ -r ~/.Xdefaults.local ]; then
-  /usr/bin/xrdb -quiet -merge -cpp /usr/bin/cpp -DUSE_LOCAL ~/.Xdefaults
+  /usr/bin/xrdb -quiet -merge -DUSE_LOCAL ~/.Xdefaults
 fi
 
 if [ -x /usr/bin/urxvtd ]; then