Merge pull request #4891 from pSub/prefer-xresources

Try to load Xresources, if that fails fall back to Xdefaults. Closes #4670
This commit is contained in:
Domen Kožar 2014-11-08 19:32:46 +01:00
commit 9ea81152cc

View file

@ -79,7 +79,9 @@ let
''}
# Load X defaults.
if test -e ~/.Xdefaults; then
if test -e ~/.Xresources; then
${xorg.xrdb}/bin/xrdb -merge ~/.Xresources
elif test -e ~/.Xdefaults; then
${xorg.xrdb}/bin/xrdb -merge ~/.Xdefaults
fi