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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.176 by root, Thu Jan 12 01:30:53 2006 UTC vs.
Revision 1.177 by root, Mon Jan 16 06:37:52 2006 UTC

 rxvt_pop_locale ()
 {
   rxvt_set_locale (savelocale);
 }
+void
+rxvt_term::make_current () const
+{
+  SET_R (this);
+  rxvt_set_locale (locale);
+  set_environ (envv);
+}
 #if ENABLE_COMBINING
 class rxvt_composite_vec rxvt_composite;
 text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
 {
 }
 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);
+  set_locale ("");
   set_environ (envv); // few things in X do not call setlocale :(
-  set_locale ("");
   if (!init_vars ())
     return false;
   init_secondary ();
   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