[ViewVC] Diff of: cvs/rxvt-unicode/src/init.C

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.139 by root, Wed Jan 11 03:13:26 2006 UTC vs.
Revision 1.140 by root, Thu Jan 12 01:30:53 2006 UTC

   rs[Rs_name] = rxvt_r_basename (argv[0]);
   /*
    * Open display, get options/resources and create the window
    */
-  {
-    TEMP_ENV;
-    if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
+  if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
-      rs[Rs_display_name] = ":0";
+    rs[Rs_display_name] = ":0";
-    get_options (r_argc, r_argv);
+  get_options (r_argc, r_argv);
-    if (!(display = displays.get (rs[Rs_display_name])))
+  if (!(display = displays.get (rs[Rs_display_name])))
-      rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
+    rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
-    extract_resources ();
+  extract_resources ();
-  }
   free (r_argv);
   /*
    * set any defaults not already set
  * This should support all European type languages.
  */
 void
 rxvt_term::set_locale (const char *locale)
 {
-  TEMP_ENV;
+  set_environ (envv);
 #if HAVE_XSETLOCALE || HAVE_SETLOCALE
   free (this->locale);
   this->locale = setlocale (LC_CTYPE, locale);
 }
 void
 rxvt_term::init_xlocale ()
 {
-  TEMP_ENV;
+  set_environ (envv);
 #ifdef USE_XIM
   if (!locale)
     rxvt_warn ("setting locale failed, working without locale support.\n");
   else
  * the slave.
  */
 void
 rxvt_term::run_command (const char *const *argv)
 {
-  TEMP_ENV; // not very temporary...
 #if ENABLE_FRILLS
   if (rs[Rs_pty_fd])
     {
       pty.pty = atoi (rs[Rs_pty_fd]);

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines