From: Jan Djärv <jan.h.d@swipnet.se>
Date: Thu, 31 Oct 2013 08:32:42 +0000 (+0100)
Subject: * emacs.c (main): Skip -psn args on OSX even if ! isatty (0).
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1049
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=26ca88709291b49e64bf1182c85cbf4b8374edda;p=emacs.git

* emacs.c (main): Skip -psn args on OSX even if ! isatty (0).
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 64d7ea5c181..0c76b176a1f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-10-31  Jan Djärv  <jan.h.d@swipnet.se>
+
+	* emacs.c (main): Skip -psn args on OSX even if ! isatty (0).
+
 2013-10-31  Glenn Morris  <rgm@gnu.org>
 
 	* emacs.c (original_pwd): New char.
diff --git a/src/emacs.c b/src/emacs.c
index e2b47bddb32..92b52f1cea6 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1201,7 +1201,7 @@ Using an Emacs configured with --with-x-toolkit=lucid does not have this problem
          chdir fails.  */
       if (! inhibit_window_system && ! isatty (0))
         chdir (getenv ("HOME"));
-      else if (skip_args < argc)
+      if (skip_args < argc)
         {
           if (!strncmp (argv[skip_args], "-psn", 4))
             {