Merge from default mhoward-lt

Tue, 17 Jun 2014 02:44:07 -0400

author
Meredith Howard <mhoward@roomag.org>
date
Tue, 17 Jun 2014 02:44:07 -0400
branch
mhoward-lt
changeset 70
431128b5fa0c
parent 66
1c1237f8b9e3 (current diff)
parent 69
b33d2188bfb9 (diff)
child 76
6dbcadb01380

Merge from default

.Xdefaults file | annotate | diff | comparison | revisions
.i3/auto-start file | annotate | diff | comparison | revisions
.i3/config file | annotate | diff | comparison | revisions
.i3status.conf file | annotate | diff | comparison | revisions
.xsessionrc file | annotate | diff | comparison | revisions
--- 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
--- 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

mercurial