Compare commits

...

2 Commits

Author SHA1 Message Date
Yukari Hafner
93de5df89b
Merge 15f9e1bea7 into 768e81a0eb 2025-08-15 04:30:33 +08:00
Yukari Hafner
15f9e1bea7
Check whether locales are the empty string and ignore them if they are.
This fixes a confusing error in compiling the xkb compose table if
LC_ALL, LC_CTYPE, or LANG are set to the empty string.
2025-06-20 22:05:11 +02:00

View File

@ -1706,11 +1706,11 @@ static void keyboardHandleKeymap(void* userData,
// Look up the preferred locale, falling back to "C" as default. // Look up the preferred locale, falling back to "C" as default.
locale = getenv("LC_ALL"); locale = getenv("LC_ALL");
if (!locale) if (!locale || strlen(locale) == 0)
locale = getenv("LC_CTYPE"); locale = getenv("LC_CTYPE");
if (!locale) if (!locale || strlen(locale) == 0)
locale = getenv("LANG"); locale = getenv("LANG");
if (!locale) if (!locale || strlen(locale) == 0)
locale = "C"; locale = "C";
composeTable = composeTable =