Module Name: xsrc
Committed By: uwe
Date: Wed Dec 29 16:01:58 UTC 2021
Modified Files:
xsrc/external/mit/xinit/dist: xinitrc.cpp
Log Message:
xinitrc: delay preprocessing of COLOR in xrdb input
Revert previous and fix it properly. #ifdef COLOR is intended to be
processed by xrdb, but the script source itself is processed by the C
preprocessor at build time. Spell that # as XHASH to protect the
conditional.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 xsrc/external/mit/xinit/dist/xinitrc.cpp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xinit/dist/xinitrc.cpp
diff -u xsrc/external/mit/xinit/dist/xinitrc.cpp:1.12 xsrc/external/mit/xinit/dist/xinitrc.cpp:1.13
--- xsrc/external/mit/xinit/dist/xinitrc.cpp:1.12 Tue Dec 28 11:48:52 2021
+++ xsrc/external/mit/xinit/dist/xinitrc.cpp Wed Dec 29 16:01:58 2021
@@ -40,7 +40,9 @@ if [ -f "$userresources" ]; then
#endif
else
XRDB -merge - <<EOF
+XHASH ifdef COLOR
*customization: -color
+XHASH endif
*VT100.foreground: grey90
*VT100.background: black
*VT100.allowBoldFonts: false
