# HG changeset patch
# User Adrian Robert <Adrian.B.Robert@gmail.com>
# Date 1217957585 0
# Node ID f152a8f9c82f9bd6333d766c4be892d2b6477f53
# Parent  fb10dad2c4275035ac2b489923f54c778ca1c6e9
emacs.c (main): Under NS, set working dir to HOME when get a 'psn' argument.

diff -r fb10dad2c427 -r f152a8f9c82f src/ChangeLog
--- a/src/ChangeLog	Tue Aug 05 16:17:07 2008 +0000
+++ b/src/ChangeLog	Tue Aug 05 17:33:05 2008 +0000
@@ -1,6 +1,6 @@
 2008-08-04  Adrian Robert  <Adrian.B.Robert@gmail.com>
 
-	* emacs.c (main): Under NS, set working dir to $HOME when get a "psn"
+	* emacs.c (main): Under NS, set working dir to HOME when get a "psn"
 	argument.
 
 2008-08-05  Juanma Barranquero  <lekktu@gmail.com>
diff -r fb10dad2c427 -r f152a8f9c82f src/emacs.c
--- a/src/emacs.c	Tue Aug 05 16:17:07 2008 +0000
+++ b/src/emacs.c	Tue Aug 05 17:33:05 2008 +0000
@@ -1337,10 +1337,9 @@
               skip_args += 1;
               chdir (getenv ("HOME"));
             }
-          else
+          else if (skip_args+1 < argc && !strncmp(argv[skip_args+1], "-psn", 4))
             {
-              if (skip_args+1 < argc && !strncmp(argv[skip_args+1], "-psn", 4))
-                  skip_args += 2;
+              skip_args += 2;
               chdir (getenv ("HOME"));
             }
         }