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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.175 by root, Thu Jan 12 00:35:39 2006 UTC vs.
Revision 1.178 by root, Mon Jan 16 08:29:57 2006 UTC

 }
 void
 rxvt_term::destroy_cb (time_watcher &w)
 {
-  SET_R (this);
+  make_current ();
   delete this;
 }
 /*----------------------------------------------------------------------*/
 /*----------------------------------------------------------------------*/
 bool
 rxvt_term::init (int argc, const char *const *argv)
 {
   SET_R (this);
-  TEMP_ENV; // few things in X do not call setlocale :(
   set_locale ("");
+  set_environ (envv); // few things in X do not call setlocale :(
   if (!init_vars ())
     return false;
   init_secondary ();
               rs[Rs_perl_eval] = 0;
             }
         }
 #endif
       rxvt_perl.init ();
-      setlocale (LC_CTYPE, curlocale); // perl init destroys this info
+      setlocale (LC_CTYPE, curlocale); // perl init destroys current locale
       HOOK_INVOKE ((this, HOOK_INIT, DT_END));
     }
 #endif
   create_windows (argc, argv);
   unsigned long fg, bg;
   const char *p;
   char **s;
   XIMStyles *xim_styles;
-  TEMP_ENV;
+  set_environ (envv);
   if (! ((p = XSetLocaleModifiers (modifiers)) && *p))
     return false;
   D_MAIN ((stderr, "rxvt_IM_get_IC ()"));
   int i;
   const char *p;
   char **s;
   char buf[IMBUFSIZ];
-  SET_R (this);
+  make_current ();
   im_destroy ();
   D_MAIN ((stderr, "rxvt_IMInstantiateCallback ()"));
   if (Input_Context)

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