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

95889848 · Adrian Robert · 3d0a4431 · 95889848 · 95889848
Commit 95889848 authored Aug 05, 2008 by Adrian Robert
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

src/ChangeLog src/ChangeLog +1 -1

src/emacs.c src/emacs.c +2 -3

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
 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>

--- 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"));
            }
        }