diff options
| author | Justin Brewer <jzb0012@auburn.edu> | 2015-03-13 17:59:26 -0400 |
|---|---|---|
| committer | Eric Koegel <eric.koegel@gmail.com> | 2015-03-28 06:59:43 +0300 |
| commit | 2b12a2365ec2677c9642c670c5bb4046efb54299 (patch) | |
| tree | 2e07551483000510f1da87375f1ead8dc935a1b8 /scripts | |
| parent | 83fd4fee8697fc5da8411c99b18900d211b72d68 (diff) | |
| download | xfce4-session-2b12a2365ec2677c9642c670c5bb4046efb54299.tar.gz | |
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@gmail.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/xinitrc.in.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/xinitrc.in.in b/scripts/xinitrc.in.in index b2344079..01a5dcc9 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 |