--- rxvt-unicode/src/init.C	2007/10/09 13:36:10	1.217
+++ rxvt-unicode/src/init.C	2007/10/31 09:55:23	1.221
@@ -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>
@@ -143,9 +156,9 @@
     "rgb:00/00/cd",             // 4: blue              (Blue3)
     "rgb:cd/00/cd",             // 5: magenta           (Magenta3)
     "rgb:00/cd/cd",             // 6: cyan              (Cyan3)
-# ifdef XTERM_COLORS                                    
+# ifdef XTERM_COLORS
     "rgb:e5/e5/e5",             // 7: white             (Grey90)
-# else                                                  
+# else
     "rgb:fa/eb/d7",             // 7: white             (AntiqueWhite)
 # endif
     /* high-intensity colors */
@@ -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
@@ -736,7 +749,7 @@
 #ifdef OFF_FOCUS_FADING
   pix_colors = pix_colors_focused;
 #endif
-  
+
   for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
     {
       const char *name = rs[Rs_color + i];