[Emacs-diffs] trunk r114882: * emacs.c (main): Skip -psn args on OSX even if ! isatty (0).

[Jan D.]

------------------------------------------------------------
revno: 114882
revision-id: address@hidden
parent: address@hidden
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Thu 2013-10-31 09:32:42 +0100
message:
  * emacs.c (main): Skip -psn args on OSX even if ! isatty (0).
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/emacs.c                    emacs.c-20091113204419-o5vbwnq5f7feedwu-241

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-10-31 07:18:42 +0000
+++ b/src/ChangeLog     2013-10-31 08:32:42 +0000
@@ -1,3 +1,7 @@
+2013-10-31  Jan Djärv  <address@hidden>
+
+       * emacs.c (main): Skip -psn args on OSX even if ! isatty (0).
+
 2013-10-31  Glenn Morris  <address@hidden>
 
        * emacs.c (original_pwd): New char.

=== modified file 'src/emacs.c'
--- a/src/emacs.c       2013-10-31 07:18:42 +0000
+++ b/src/emacs.c       2013-10-31 08:32:42 +0000
@@ -1201,7 +1201,7 @@
          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))
             {