From 26ca88709291b49e64bf1182c85cbf4b8374edda Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20Dj=C3=A4rv?= Date: Thu, 31 Oct 2013 09:32:42 +0100 Subject: [PATCH] * emacs.c (main): Skip -psn args on OSX even if ! isatty (0). --- src/ChangeLog | 4 ++++ src/emacs.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) 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 + + * emacs.c (main): Skip -psn args on OSX even if ! isatty (0). + 2013-10-31 Glenn Morris * 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)) { -- 2.39.2