Merged from miles@gnu.org--gnu-2005 (patch 659-663)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-659
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-660
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-661
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-662
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-663
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-445

1 files changed, 8 insertions, 2 deletions

diff --git a/src/emacs.c b/src/emacs.c
index 33941ae9227..ff1a40283fc 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -963,9 +963,15 @@ main (argc, argv
 
 #ifdef MAC_OSX
   /* Skip process serial number passed in the form -psn_x_y as
-     command-line argument.  */
+     command-line argument.  The WindowServer adds this option when
+     Emacs is invoked from the Finder or by the `open' command.  In
+     these cases, the working directory becomes `/', so we change it
+     to the user's home directory.  */
   if (argc > skip_args + 1 && strncmp (argv[skip_args+1], "-psn_", 5) == 0)
-    skip_args++;
+    {
+      chdir (getenv ("HOME"));
+      skip_args++;
+    }
 #endif /* MAC_OSX */
 
 #ifdef VMS