diff -ru xemacs-21.5.21.orig/src/intl.c xemacs-21.5.21/src/intl.c
--- xemacs-21.5.21.orig/src/intl.c	2002-05-28 10:44:55.000000000 +0200
+++ xemacs-21.5.21/src/intl.c	2005-06-13 16:23:51.000000000 +0200
@@ -82,8 +82,10 @@
 #ifdef HAVE_X_WINDOWS
   if (!init_x_locale (locale))
     {
-      /* Locale not supported under X.  Put it back. */
-      setlocale (LC_ALL, loc);
+      /* Locale not supported under X.  Set locale to "C" and print a warning. */
+	    warn_when_safe (Qwarning, Qwarning,
+			    "locale not supported by Xlib, setting locale to C.");
+      setlocale (LC_ALL, "C");
       setlocale (LC_NUMERIC, "C");
       return Qnil;
     }