--- rxvt-unicode/src/rxvtc.C	2007/11/18 00:21:34	1.30
+++ rxvt-unicode/src/rxvtc.C	2011/02/21 07:41:02	1.33
@@ -3,7 +3,7 @@
  *----------------------------------------------------------------------*
  *
  * All portions of code are copyright by their respective author/s.
- * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2006 Marc Lehmann <schmorp@schmorp.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -49,7 +49,7 @@
   sockaddr_un sa;
   char *sockname = rxvt_connection::unix_sockname ();
 
-  if (strlen(sockname) >= sizeof(sa.sun_path))
+  if (strlen (sockname) >= sizeof (sa.sun_path))
     {
       fputs ("socket name too long, aborting.\n", stderr);
       exit (STATUS_FAILURE);
@@ -98,7 +98,6 @@
   }
 
   c.send ("NEW");
-  c.send ("CWD"), c.send (cwd);
 
   for (char **var = environ; *var; var++)
     c.send ("ENV"), c.send (*var);
@@ -107,6 +106,9 @@
   base = base ? base + 1 : argv[0];
   c.send ("ARG"), c.send (strcmp (base, RXVTNAME "c") ? base : RXVTNAME);
 
+  c.send ("ARG"), c.send ("-cd");
+  c.send ("ARG"), c.send (cwd);
+
   for (int i = 1; i < argc; i++)
     c.send ("ARG"), c.send (argv[i]);