From ad6bed62dd36ec232155308b0b78179a9054fc33 Mon Sep 17 00:00:00 2001 From: Justin Brewer Date: Fri, 13 Mar 2015 17:59:26 -0400 Subject: [PATCH] Drop -nocpp option from call to xrdb Users' .Xresources files often contain preprocessor directives, so disabling the preprocessor breaks the behavior of these files. --- 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 -- 2.3.2