--- rxvt-unicode/src/rxvtperl.xs	2006/01/12 00:35:39	1.56
+++ rxvt-unicode/src/rxvtperl.xs	2006/01/12 01:30:53	1.57
@@ -413,7 +413,8 @@
 {
   if (!perl)
     {
-      temp_environ temp_environ(rxvt_environ);
+      perl_environ = rxvt_environ;
+      swap (perl_environ, environ);
 
       char *argv[] = {
         "",
@@ -433,6 +434,8 @@
           perl_free (perl);
           perl = 0;
         }
+
+      swap (perl_environ, environ);
     }
 }
 
@@ -484,145 +487,154 @@
         return false;
     }
 
-  temp_environ temp_environ(rxvt_environ);
-
-  dSP;
-  va_list ap;
-
-  va_start (ap, htype);
+  swap (perl_environ, environ);
 
-  ENTER;
-  SAVETMPS;
-
-  PUSHMARK (SP);
+  try
+    {
+      dSP;
+      va_list ap;
 
-  XPUSHs (sv_2mortal (newSVterm (term)));
-  XPUSHs (sv_2mortal (newSViv (htype)));
+      va_start (ap, htype);
 
-  for (;;) {
-    data_type dt = (data_type)va_arg (ap, int);
+      ENTER;
+      SAVETMPS;
 
-    switch (dt)
-      {
-        case DT_INT:
-          XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
-          break;
+      PUSHMARK (SP);
 
-        case DT_LONG:
-          XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
-          break;
+      XPUSHs (sv_2mortal (newSVterm (term)));
+      XPUSHs (sv_2mortal (newSViv (htype)));
 
-        case DT_STR:
-          XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
-          break;
+      for (;;) {
+        data_type dt = (data_type)va_arg (ap, int);
 
-        case DT_STR_LEN:
+        switch (dt)
           {
-            char *str = va_arg (ap, char *);
-            int len = va_arg (ap, int);
+            case DT_INT:
+              XPUSHs (sv_2mortal (newSViv (va_arg (ap, int))));
+              break;
+
+            case DT_LONG:
+              XPUSHs (sv_2mortal (newSViv (va_arg (ap, long))));
+              break;
+
+            case DT_STR:
+              XPUSHs (taint (sv_2mortal (newSVpv (va_arg (ap, char *), 0))));
+              break;
 
-            XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
-          }
-          break;
+            case DT_STR_LEN:
+              {
+                char *str = va_arg (ap, char *);
+                int len = va_arg (ap, int);
 
-        case DT_WCS_LEN:
-          {
-            wchar_t *wstr = va_arg (ap, wchar_t *);
-            int wlen = va_arg (ap, int);
+                XPUSHs (taint (sv_2mortal (newSVpvn (str, len))));
+              }
+              break;
 
-            XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
-          }
-         break;
+            case DT_WCS_LEN:
+              {
+                wchar_t *wstr = va_arg (ap, wchar_t *);
+                int wlen = va_arg (ap, int);
 
-        case DT_XEVENT:
-          {
-            XEvent *xe = va_arg (ap, XEvent *);
-            HV *hv = newHV ();
+                XPUSHs (taint (sv_2mortal (wcs2sv (wstr, wlen))));
+              }
+             break;
+
+            case DT_XEVENT:
+              {
+                XEvent *xe = va_arg (ap, XEvent *);
+                HV *hv = newHV ();
 
 #           define set(name, sv) hv_store (hv, # name,  sizeof (# name) - 1, sv, 0)
 #           define setiv(name, val) hv_store (hv, # name,  sizeof (# name) - 1, newSViv (val), 0)
 #           undef set
 
-            setiv (type,       xe->type);
-            setiv (send_event, xe->xany.send_event);
-            setiv (serial,     xe->xany.serial);
+                setiv (type,       xe->type);
+                setiv (send_event, xe->xany.send_event);
+                setiv (serial,     xe->xany.serial);
+
+                switch (xe->type)
+                  {
+                    case KeyPress:
+                    case KeyRelease:
+                    case ButtonPress:
+                    case ButtonRelease:
+                    case MotionNotify:
+                      setiv (time,   xe->xmotion.time);
+                      setiv (x,      xe->xmotion.x);
+                      setiv (y,      xe->xmotion.y);
+                      setiv (row,    xe->xmotion.y / term->fheight);
+                      setiv (col,    xe->xmotion.x / term->fwidth);
+                      setiv (x_root, xe->xmotion.x_root);
+                      setiv (y_root, xe->xmotion.y_root);
+                      setiv (state,  xe->xmotion.state);
+                      break;
+                  }
+
+                switch (xe->type)
+                  {
+                    case KeyPress:
+                    case KeyRelease:
+                      setiv (keycode, xe->xkey.keycode);
+                      break;
+
+                    case ButtonPress:
+                    case ButtonRelease:
+                      setiv (button,  xe->xbutton.button);
+                      break;
+
+                    case MotionNotify:
+                      setiv (is_hint, xe->xmotion.is_hint);
+                      break;
+                  }
 
-            switch (xe->type)
-              {
-                case KeyPress:
-                case KeyRelease:
-                case ButtonPress:
-                case ButtonRelease:
-                case MotionNotify:
-                  setiv (time,   xe->xmotion.time);
-                  setiv (x,      xe->xmotion.x);
-                  setiv (y,      xe->xmotion.y);
-                  setiv (row,    xe->xmotion.y / term->fheight);
-                  setiv (col,    xe->xmotion.x / term->fwidth);
-                  setiv (x_root, xe->xmotion.x_root);
-                  setiv (y_root, xe->xmotion.y_root);
-                  setiv (state,  xe->xmotion.state);
-                  break;
+                XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
               }
+              break;
 
-            switch (xe->type)
+            case DT_END:
               {
-                case KeyPress:
-                case KeyRelease:
-                  setiv (keycode, xe->xkey.keycode);
-                  break;
-
-                case ButtonPress:
-                case ButtonRelease:
-                  setiv (button,  xe->xbutton.button);
-                  break;
-
-                case MotionNotify:
-                  setiv (is_hint, xe->xmotion.is_hint);
-                  break;
-              }
+                va_end (ap);
 
-            XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
-          }
-          break;
-
-        case DT_END:
-          {
-            va_end (ap);
-
-            PUTBACK;
-            int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
-            SPAGAIN;
-
-            if (count)
-              {
-                SV *status = POPs;
-                count = SvTRUE (status);
-              }
-
-            PUTBACK;
-            FREETMPS;
-            LEAVE;
+                PUTBACK;
+                int count = call_pv ("urxvt::invoke", G_ARRAY | G_EVAL);
+                SPAGAIN;
+
+                if (count)
+                  {
+                    SV *status = POPs;
+                    count = SvTRUE (status);
+                  }
+
+                PUTBACK;
+                FREETMPS;
+                LEAVE;
+
+                if (SvTRUE (ERRSV))
+                  {
+                    rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
+                    ungrab (term); // better lose the grab than the session
+                  }
+
+                if (htype == HOOK_DESTROY)
+                  {
+                    clearSVptr ((SV *)term->perl.self);
+                    SvREFCNT_dec ((SV *)term->perl.self);
+                  }
 
-            if (SvTRUE (ERRSV))
-              {
-                rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
-                ungrab (term); // better lose the grab than the session
-              }
-
-            if (htype == HOOK_DESTROY)
-              {
-                clearSVptr ((SV *)term->perl.self);
-                SvREFCNT_dec ((SV *)term->perl.self);
+                swap (perl_environ, environ);
+                return count;
               }
 
-            return count;
+            default:
+              rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
           }
-
-        default:
-          rxvt_fatal ("FATAL: unable to pass data type %d\n", dt);
       }
-  }
+    }
+  catch (...)
+    {
+      swap (perl_environ, environ);
+      throw;
+    }
 }
 
 /////////////////////////////////////////////////////////////////////////////