From 6254cdda90d55b2f93ca238ad84e86a69f8f9c8e Mon Sep 17 00:00:00 2001 From: Dan Nicolaescu Date: Thu, 5 Aug 2010 15:20:09 -0700 Subject: [PATCH] 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. --- src/ChangeLog | 7 +++++++ src/term.c | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 6841b2644d3..575c93566ae 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2010-08-05 Dan Nicolaescu + + 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 * deps.mk (unexcoff.o): Rename unexec.[co] => unexcoff.[co]. diff --git a/src/term.c b/src/term.c index 85f4f2b39dd..f41aacb2742 100644 --- 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) -- 2.11.4.GIT