--- rxvt-unicode/src/init.C	2006/01/06 05:37:59	1.134
+++ rxvt-unicode/src/init.C	2006/01/11 03:13:26	1.139
@@ -341,15 +341,20 @@
   /*
    * Open display, get options/resources and create the window
    */
-  if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
-    rs[Rs_display_name] = ":0";
+  {
+    TEMP_ENV;
 
-  get_options (r_argc, r_argv);
+    if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
+      rs[Rs_display_name] = ":0";
 
-  if (!(display = displays.get (rs[Rs_display_name])))
-    rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
+    get_options (r_argc, r_argv);
+
+    if (!(display = displays.get (rs[Rs_display_name])))
+      rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
+
+    extract_resources ();
+  }
 
-  extract_resources ();
   free (r_argv);
 
   /*
@@ -393,7 +398,7 @@
 
   /* no point having a scrollbar without having any scrollback! */
   if (!saveLines)
-    CLR_OPTION (Opt_scrollBar);
+    set_option (Opt_scrollBar, 0);
 
 #ifdef PRINTPIPE
   if (!rs[Rs_print_pipe])
@@ -578,6 +583,8 @@
 void
 rxvt_term::set_locale (const char *locale)
 {
+  TEMP_ENV;
+
 #if HAVE_XSETLOCALE || HAVE_SETLOCALE
   free (this->locale);
   this->locale = setlocale (LC_CTYPE, locale);
@@ -586,13 +593,13 @@
     {
       if (*locale)
         {
-          rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);
-          setlocale (LC_CTYPE, "");
+          rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
+          setlocale (LC_CTYPE, "C");
         }
       else
         rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
 
-      this->locale = "";
+      this->locale = "C";
     }
 
 
@@ -617,6 +624,8 @@
 void
 rxvt_term::init_xlocale ()
 {
+  TEMP_ENV;
+
 #ifdef USE_XIM
   if (!locale)
     rxvt_warn ("setting locale failed, working without locale support.\n");
@@ -1093,7 +1102,7 @@
 
   if (OPTION (Opt_pointerBlank)
 #ifdef ENABLE_PERL
-      || self
+      || perl.self
 #endif
       )
     vt_emask |= PointerMotionMask;
@@ -1406,6 +1415,8 @@
 void
 rxvt_term::run_command (const char *const *argv)
 {
+  TEMP_ENV; // not very temporary...
+
 #if ENABLE_FRILLS
   if (rs[Rs_pty_fd])
     {
@@ -1582,7 +1593,7 @@
     }
   else
     {
-      const char     *argv0, *shell;
+      const char *argv0, *shell;
 
       if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
         shell = "/bin/sh";
@@ -1597,6 +1608,7 @@
           strcpy (&login[1], argv0);
           argv0 = login;
         }
+
       execlp (shell, argv0, NULL);
       /* no error message: STDERR is closed! */
     }