# HG changeset patch # User Meredith Howard # Date 1402802893 14400 # Node ID 8af5835e43e1851de7fa786398b3154db9730fdf # Parent e341df2dafdab71578c74525cdcb3501844e619f Avoid warning when no .Xdefaults.local exists diff --git a/.Xdefaults b/.Xdefaults --- a/.Xdefaults +++ b/.Xdefaults @@ -15,4 +15,6 @@ URxvt.saveLines: 1000 URxvt.iso14755: false URxvt.iso14755_52: false +#ifdef USE_LOCAL #include ".Xdefaults.local" +#endif diff --git a/.xsessionrc b/.xsessionrc --- a/.xsessionrc +++ b/.xsessionrc @@ -25,7 +25,7 @@ fi if [ -r ~/.Xdefaults.local ]; then - /usr/bin/xrdb -quiet -merge -cpp /usr/bin/cpp ~/.Xdefaults.local + /usr/bin/xrdb -quiet -merge -cpp /usr/bin/cpp -DUSE_LOCAL ~/.Xdefaults fi if [ -r ~/.xsessionrc.local ]; then