small xinitrc mod diff

Don Christensen djc at
Fri May 14 22:44:22 CEST 2004

My .Xdefaults file uses #include to pull in various other sub files.
As such, the xinitrc on CVS HEAD (xfce-utils/scripts/xinitrc) is
broken for me.  The following diff fixes it.  Unless there are
good reasons to avoid cpp processing of xrdb files, please
consider applying this to CVS.


% cvs -d:pserver:anoncvs at diff xinitrc
Index: xinitrc
RCS file: /cvsroot/xfce/xfce4/xfce-utils/scripts/xinitrc,v
retrieving revision 1.20
diff -r1.20 xinitrc
< test -f $HOME/.Xdefaults && xrdb -nocpp -merge $HOME/.Xdefaults
 > test -f $HOME/.Xdefaults && xrdb -merge $HOME/.Xdefaults
< test -f $XFCE4HOME/Xft.xrdb && xrdb -nocpp -merge $XFCE4HOME/Xft.xrdb
 > test -f $XFCE4HOME/Xft.xrdb && xrdb -merge $XFCE4HOME/Xft.xrdb
< test -f $HOME/.Xresources && xrdb -nocpp -merge $HOME/.Xresources
 > test -f $HOME/.Xresources && xrdb -merge $HOME/.Xresources

Don Christensen       Senior Software Development Engineer
djc at         Cisco Systems, Santa Cruz, CA
   "It was a new day yesterday, but it's an old day now."

More information about the Xfce4-dev mailing list