--- lib/X11/Xrm.c	Sun Oct  4 18:36:55 1998
+++ lib/X11/Xrm.c	Thu May 10 05:42:46 2001
@@ -63,6 +63,7 @@
 #endif
 #include 	"XrmI.h"
 #include	<X11/Xos.h>
+#include	"Xlocale.h"
 
 #ifdef __STDC__
 #define Const const
@@ -323,6 +324,7 @@
 
 void XrmInitialize()
 {
+    setlocale(~LC_CTYPE,"");
     XrmQString = XrmPermStringToQuark("String");
     XrmQANY = XrmPermStringToQuark("?");
 }
--- lib/X11/SetLocale.c	Fri Jun 12 13:02:02 1998
+++ lib/X11/SetLocale.c	Thu May 10 05:41:41 2001
@@ -92,8 +92,10 @@
     XrmMethods methods;
     XPointer state;
 
-    if (category != LC_CTYPE && category != LC_ALL)
+    if (category != LC_CTYPE && category != LC_ALL && category != ~LC_CTYPE && category != ~LC_ALL)
 	return NULL;
+    if (xsl_name && (category == ~LC_CTYPE || category == ~LC_ALL))
+        return NULL;
     if (!name) {
 	if (xsl_name)
 	    return xsl_name;