[Xfce4-commits] [xfce/xfce4-session] 01/01: Drop -nocpp option from call to xrdb

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

eric pushed a commit to branch master
in repository xfce/xfce4-session.

commit 2b12a2365ec2677c9642c670c5bb4046efb54299
Author: Justin Brewer <jzb0012 at auburn.edu>
Date:   Fri Mar 13 17:59:26 2015 -0400

    Drop -nocpp option from call to xrdb
    
    Users' .Xresources files often contain preprocessor directives, so disabling the
    preprocessor breaks the behavior of these files.
    
    Signed-off-by: Eric Koegel <eric.koegel at gmail.com>
---
 scripts/xinitrc.in.in |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in
index b234407..01a5dcc 100755
--- a/scripts/xinitrc.in.in
+++ b/scripts/xinitrc.in.in
@@ -82,7 +82,7 @@ test -r "$BASEDIR/Xcursor.xrdb" && XRESOURCES="$XRESOURCES $BASEDIR/Xcursor.xrdb
 test -r "$HOME/.Xresources" && XRESOURCES="$XRESOURCES $HOME/.Xresources"
 
 # load all X resources (adds /dev/null to avoid an empty list that would hang the process)
-cat /dev/null $XRESOURCES | xrdb -nocpp -merge -
+cat /dev/null $XRESOURCES | xrdb -merge -
 
 # load local modmap
 test -r $HOME/.Xmodmap && xmodmap $HOME/.Xmodmap

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.