# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1281046809 25200
# Node ID ce2dcd6fda75198fc8f2f471afa96767b86a63f3
# Parent  d8dbbecff67228d1d469990ed1b2db4426b60732
Fix emacs -Q -f server-start & emacsclient -t on GNU/Linux.
* src/term.c (dissociate_if_controlling_tty): Use USG5 instead of
USG.  This is equivalent to defined (USG) && !defined (BSD_PGRPS),
which is what was there before BSD_PGRPS was removed.

diff -r d8dbbecff672 -r ce2dcd6fda75 src/ChangeLog
--- a/src/ChangeLog	Thu Aug 05 11:30:35 2010 -0700
+++ b/src/ChangeLog	Thu Aug 05 15:20:09 2010 -0700
@@ -1,3 +1,10 @@
+2010-08-05  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	Fix emacs -Q -f server-start & emacsclient -t on GNU/Linux.
+	* term.c (dissociate_if_controlling_tty): Use USG5 instead of
+	USG.  This is equivalent to defined (USG) && !defined (BSD_PGRPS),
+	which is what was there before BSD_PGRPS was removed.
+
 2010-08-05  Eli Zaretskii  <eliz@gnu.org>
 
 	* deps.mk (unexcoff.o): Rename unexec.[co] => unexcoff.[co].
diff -r d8dbbecff672 -r ce2dcd6fda75 src/term.c
--- a/src/term.c	Thu Aug 05 11:30:35 2010 -0700
+++ b/src/term.c	Thu Aug 05 15:20:09 2010 -0700
@@ -3343,7 +3343,7 @@
   EMACS_GET_TTY_PGRP (fd, &pgid); /* If tcgetpgrp succeeds, fd is the ctty. */
   if (pgid != -1)
     {
-#if defined (USG)
+#if defined (USG5)
       setpgrp ();
       no_controlling_tty = 1;
 #elif defined (CYGWIN)