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 --git a/src/ChangeLog b/src/ChangeLog
index 6841b2644d3cf4186cdef07cfe940637d86f31ee..575c93566aef78406f24f2c654956aba03a56123 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/term.c b/src/term.c
index 85f4f2b39ddc06c596ec20bd0d5711ef116a40eb..f41aacb274254ece72ce614175fbda269367e861 100644 (file)
--- a/src/term.c
+++ b/src/term.c
@@ -3343,7 +3343,7 @@ dissociate_if_controlling_tty (int fd)
   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)