(main): Do the setpgrp after checking for -batch.

diff --git a/src/emacs.c b/src/emacs.c
index abd6e9d1dd174b8739585b10a9dc687c8dbb1683..04f45a3a8668226cb928f60cdf8be93dace63253 100644 (file)
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -409,21 +409,6 @@ main (argc, argv, envp)
 
   clearerr (stdin);
 
-  if (! noninteractive1)
-    {
-#ifdef BSD_PGRPS
-      if (initialized)
-       {
-         inherited_pgroup = EMACS_GETPGRP (0);
-         setpgrp (0, getpid ());
-       }
-#else
-#if defined (USG5) && defined (INTERRUPT_INPUT)
-      setpgrp ();
-#endif
-#endif
-    }
-
 #ifdef APOLLO
 #ifndef APOLLO_SR10
   /* If USE_DOMAIN_ACLS environment variable exists,
@@ -507,6 +492,21 @@ main (argc, argv, envp)
       noninteractive = 1;
     }
 
+  if (! noninteractive)
+    {
+#ifdef BSD_PGRPS
+      if (initialized)
+       {
+         inherited_pgroup = EMACS_GETPGRP (0);
+         setpgrp (0, getpid ());
+       }
+#else
+#if defined (USG5) && defined (INTERRUPT_INPUT)
+      setpgrp ();
+#endif
+#endif
+    }
+
 #ifdef POSIX_SIGNALS
   init_signals ();
 #endif