--- rxvt-unicode/src/init.C	2007/10/09 13:36:10	1.217
+++ rxvt-unicode/src/init.C	2007/10/28 11:25:04	1.220
@@ -43,6 +43,19 @@
 
 #include <csignal>
 
+#ifdef HAVE_XSETLOCALE
+# define X_LOCALE
+# include <X11/Xlocale.h>
+#else
+# ifdef HAVE_SETLOCALE
+#  include <clocale>
+# endif
+#endif
+
+#ifdef HAVE_NL_LANGINFO
+# include <langinfo.h>
+#endif
+
 #ifdef DISPLAY_IS_IP
 /* On Solaris link with -lsocket and -lnsl */
 #include <sys/types.h>
@@ -358,7 +371,7 @@
   if (r_argc == argc)
     cmd_argv = NULL;
   else if (!argv[r_argc + 1])
-    rxvt_fatal ("-e requires an argument\n");
+    rxvt_fatal ("option '-e' requires an argument, aborting.\n");
   else
     {
       cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
@@ -646,7 +659,7 @@
     }
 
 
-  this->locale = rxvt_strdup (this->locale);
+  this->locale = strdup (this->locale);
   SET_LOCALE (this->locale);
   mbstate.reset ();
 #endif