emacs.c (main): Under NS, set working dir to HOME when get a 'psn' argument.

diff --git a/src/ChangeLog b/src/ChangeLog
index ce5e7a3a04ab78154fea1a475023f66f8be73071..73f93df544f3dd56728583e089357e2d7e9f52d5 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/emacs.c b/src/emacs.c
index 0f9d3fd555482857958bbe10ed5e92d28c37b8a1..21c57f045df2354474562965446c9115fff702fa 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1337,10 +1337,9 @@ main (int argc, char **argv)
               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"));
             }
         }