[Emacs-diffs] /srv/bzr/emacs/trunk r100980: Fix emacs -Q -f server-start & emacsclient -t on GNU/Linux.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 100980
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Thu 2010-08-05 15:20:09 -0700
message:
  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.
modified:
  src/ChangeLog
  src/term.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-08-05 17:11:32 +0000
+++ b/src/ChangeLog     2010-08-05 22:20:09 +0000
@@ -1,3 +1,10 @@
+2010-08-05  Dan Nicolaescu  <address@hidden>
+
+       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  <address@hidden>
 
        * deps.mk (unexcoff.o): Rename unexec.[co] => unexcoff.[co].

=== modified file 'src/term.c'
--- a/src/term.c        2010-07-27 04:20:51 +0000
+++ b/src/term.c        2010-08-05 22:20:09 +0000
@@ -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)