--- rxvt-unicode/src/init.C	2004/02/13 12:16:21	1.26
+++ rxvt-unicode/src/init.C	2004/02/21 22:14:00	1.30
@@ -11,6 +11,7 @@
  *                              - extensive modifications
  * Copyright (c) 1999      D J Hawkey Jr <hawkeyd@visi.com>
  *                              - QNX support
+ * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -764,9 +765,12 @@
    * @ COLORTERM: terminal sub-name and also indicates its color
    * @ TERM:      terminal name
    * @ TERMINFO:  path to terminfo directory
+   * @ COLORFGBG: fg;bg color codes
    */
   putenv (env_display);
   putenv (env_windowid);
+  if (env_colorfgbg)
+    putenv (env_colorfgbg);
 
 #ifdef RXVT_TERMINFO
   putenv ("TERMINFO=" RXVT_TERMINFO);
@@ -805,6 +809,8 @@
 #if HAVE_XSETLOCALE || HAVE_SETLOCALE
   free (this->locale);
   this->locale = rxvt_strdup (setlocale (LC_CTYPE, ""));
+  SET_LOCALE (this->locale);
+  mbstate.reset ();
 #endif
 #if HAVE_NL_LANGINFO
   free (codeset);
@@ -1363,6 +1369,8 @@
       case 0:
         close (cfd);             /* only keep tty_fd and STDERR open */
 
+        init_env ();
+
         if (rxvt_control_tty (tty_fd, ttydev) < 0)
           rxvt_print_error ("could not obtain control of tty");
         else